| commit | d83e548dd4bbd6a5f213d203f874b658ee62dbdc | [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 | 6f2d0962d4185bddefb3b68fc6976054ad3477f5 | |
| parent | 6b193fed098d5856d330bb63cc1acfc3713250e8 [diff] | |
| parent | b8efdf7f80d9aa2cbeff881f22d283cf5045c379 [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