| commit | 70333cca56fd766555e46395e6d9a64c8d82ff49 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Wed Jan 26 14:15:15 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 14:15:15 2011 -0800 |
| tree | 34b3056aa39e2b0d2b3b50cfbc89c6e92575a180 | |
| parent | 78f80beb6bc975fa012a0b190c8bd0130bd44db0 [diff] | |
| parent | ac571749a577c3575793f870e95012ce6637f977 [diff] |
am b8efdf7f: (-s ours) am 1155efdc: (-s ours) am 2ba92c71: do not merge bug 3370834 Cherrypick from master * commit 'b8efdf7f80d9aa2cbeff881f22d283cf5045c379': do not merge bug 3370834 Cherrypick from master