tree c6247e557f9e549a558859c2170645e2b1d9dc15
parent 2eb49ff2a3f7066cae1768d2314c4f912bd6c28d
parent 574d20ec84551370987dde530c27ec493bdef564
author Android (Google) Code Review <android-gerrit@google.com> 1243895820 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1243895820 -0700

Merge change 2865 into donut

* changes:
  Fixes #1890155.