tree be4412a48f3bcd4ee6271bb8661949c5d7a2c490
parent e9190a2750e1fb67e300d2c128227cc9b7339efe
parent 760ec4a095567457707abe764cf4dfda0ed84032
author Android (Google) Code Review <android-gerrit@google.com> 1245300020 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1245300020 -0700

Merge change 4579 into donut

* changes:
  Fix issue #1924851