| commit | 1230fcc986d44595141feed3430244a764f4583f | [log] [tgz] |
|---|---|---|
| author | Patrick Scott <phanna@android.com> | Wed Jul 15 13:41:45 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:41:45 2009 -0700 |
| tree | f72177e1ae59156c798eb931e13574c5cd068edc | |
| parent | 650a7b8a8606e04244494fed324f5d4526849e33 [diff] | |
| parent | e8dc977d91b95b3b3f56ffdadebeba4a04001200 [diff] |
am e8dc977d: (-s ours) Do not merge. Merge commit 'e8dc977d91b95b3b3f56ffdadebeba4a04001200' * commit 'e8dc977d91b95b3b3f56ffdadebeba4a04001200': Do not merge.