tree a05927daa315c5338b5424e1916c5a98272f9a13
parent 44d258d5be10ff68e0eae700b6439ec4b94f5a31
parent 730126bf5a087bd9bc9e84b79a35433cd466d992
author Robert Greenwalt <rgreenwalt@google.com> 1297882554 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297882554 -0800

am 730126bf: (-s ours) am 3259d885: Merge "DO NOT MERGE - backport of l92a02b31 from master" into gingerbread

* commit '730126bf5a087bd9bc9e84b79a35433cd466d992':
  DO NOT MERGE - backport of l92a02b31 from master