| commit | 5625a40c22303cfda31c604e701e07655a20ec3b | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Mar 14 10:53:38 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 10:53:38 2011 -0700 |
| tree | efa5887429c8b55fa213f498f7653280eacd8e2c | |
| parent | 423572b4e2111a38553e2cc9fb239e1b0577cbab [diff] | |
| parent | 102b5464b7d18fb36f58a3638ee72e8d6b54bd09 [diff] |
am 102b5464: (-s ours) am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread * commit '102b5464b7d18fb36f58a3638ee72e8d6b54bd09': DO NOT MERGE Backport of I1f55df8a from master.