tree 430cee5364aa7c0e970184d5d7a14462c196cb3e
parent 1a16ea88edefc0d80126090f7ad239dbf5231751
parent 9dc49e93f869d0e4500ce503310b80e48f9d0183
author Android (Google) Code Review <android-gerrit@google.com> 1246914861 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1246914861 -0700

Merge change 6269

* changes:
  Revert "hand rolled out 220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"