tree 36696117fb79a51028449d235f88d6fe117e59e0
parent 313671b9452c6a62df315cac20ba3fd4f7e9b14a
parent a6faae32608833f3d26d57bc6bace4f2a9add8bd
author Ben Chan <benchan@chromium.org> 1348040652 -0700
committer Ben Chan <benchan@chromium.org> 1348040652 -0700

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

Change-Id: I7a1102a649cdea6d11f3d4912701da794abad20d