tree e3dc1d1be5560e29835ffbf945b61bbcd9cdeb9a
parent a845f598533add1b5a64a22f73570d08434566ef
parent 5625a40c22303cfda31c604e701e07655a20ec3b
author Robert Greenwalt <rgreenwalt@google.com> 1300129541 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300129541 -0700

am 5625a40c: (-s ours) am 102b5464: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread

* commit '5625a40c22303cfda31c604e701e07655a20ec3b':
  DO NOT MERGE Backport of I1f55df8a from master.