| commit | 41cce7b013ec77852b43c8ae3a4b61ff10f75ad9 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Sat Jan 29 09:54:41 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 09:54:41 2011 -0800 |
| tree | 1e0b03164753ed7a9a5fb5e98a5cd900288a6580 | |
| parent | 91e7b0562dfb9def27be42761057614d41234206 [diff] | |
| parent | bfa2f13fd3f463dbceea4d3a18c3124e70df0a05 [diff] |
am 2ba92c71: (-s ours) do not merge bug 3370834 Cherrypick from master * commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master