| commit | 1e4532540e79a7176dc681c5a10e99b25ab031ec | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Wed Sep 01 08:31:02 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 01 08:31:02 2010 -0700 |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf | |
| parent | 56685cbc51080e7a6e1fcdd96e99dfe2c0ea05fa [diff] | |
| parent | c6f9933204700952b0168e5d1f2d670e91ac9a67 [diff] |
am 0171bfba: (-s ours) am 73ef5d4e: DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365. Merge commit '0171bfba04af5964f8863e334df3ed072a9675ef' * commit '0171bfba04af5964f8863e334df3ed072a9675ef': DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.