tree 6761c1779080310b1e6f12ed91f8fdc9c354038e
parent d1411c3b492fd0c77e82a9fe1089a7f855da12dd
parent 0c8d4f92f85c6d6be190bb6a490d195419b82d37
author Ben Chan <benchan@chromium.org> 1343069682 -0700
committer Ben Chan <benchan@chromium.org> 1343069682 -0700

Merge remote-tracking branch 'cros/master' into 'cros/release-R21-2465.B'

Change-Id: I4bdc18f091de8d1f6603d15e92153c1781eea055