tree 4ecb5badb1932bf75be6e6dd474115da20b8e0ce
parent d84aa185149edea1f1eba95a2c948930348864fe
parent f993ad5b89a8aa47fcbc7494811f45bb74cb8713
author Android (Google) Code Review <android-gerrit@google.com> 1244147300 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1244147300 -0700

Merge change 3192 into donut

* changes:
  Fixes #1882836.