tree 272ff851a1102d533889f8882d9ff518a6ead4d4
parent 0016d95c86b0cb46e7cc24c4a810151d74b551c7
parent 201e0cea5fa9747ebd57e7da35c91f131d51bcf8
author Ben Chan <benchan@chromium.org> 1348168756 -0700
committer Ben Chan <benchan@chromium.org> 1348168756 -0700

Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Change-Id: Ic94301549785204f75f930a24d38ce2d7e550f53