| commit | 0e8b9b6792ea4f1a485bd31f246e955bdd654f07 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Mar 14 12:05:41 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 12:05:41 2011 -0700 |
| tree | e3dc1d1be5560e29835ffbf945b61bbcd9cdeb9a | |
| parent | a845f598533add1b5a64a22f73570d08434566ef [diff] | |
| parent | 5625a40c22303cfda31c604e701e07655a20ec3b [diff] |
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.