tree a8b8a21035b6c977ed330022082e9098dfb0ebeb
parent 49f98ce10dadcf529108ee070bc6d1e7ec3c6433
parent 570dd0b4da533032ba4ec6214eeebb1c90f6d512
author Android (Google) Code Review <android-gerrit@google.com> 1243357490 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1243357490 -0700

Merge change 2331 into donut

* changes:
  Fix issue 1846343 - part 1