| commit | dd101483252f5df6513d93fda70bea9a80ff1382 | [log] [tgz] |
|---|---|---|
| author | Romain Guy <romainguy@google.com> | Fri Mar 18 17:02:10 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 18 17:02:10 2011 -0700 |
| tree | f56cac211eb9d1efe07fae6cffadf5536e59a3c4 | |
| parent | 0be43bd2b16bec9a314483a41cbbbba75cbf85dc [diff] | |
| parent | 595d6f085b01ace24f06595a10107d222de07cf1 [diff] |
am 595d6f08: (-s ours) am bc411cdd: Merge 520c90cc from master. do not merge. * commit '595d6f085b01ace24f06595a10107d222de07cf1': Merge 520c90cc from master. do not merge.