tree 7be144bfbcbc6c7a8d8e327a2aa45e22669561d7
parent f2ab9a4a1c3c6eb37de2fa3064a436bfeaa0050e
parent 52192700a7a00c44c9737b8f991a3d266b72a278
author Android (Google) Code Review <android-gerrit@google.com> 1243629837 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1243629837 -0700

Merge change 2731 into donut

* changes:
  Fixes #1873537.