| commit | 986cd9a00130eadeab3fe95866f227c8cbd70ed5 | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Wed Jan 26 14:17:33 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 14:17:33 2011 -0800 |
| tree | 2f95df5fffce520ee4f8c93c51328cc6af010ea1 | |
| parent | f2faac71fd54ef16807b94d19e46d7ad99b001a7 [diff] | |
| parent | c6ba82b58e7a7207f19190a8b814ce8a131c109e [diff] |
am c6ba82b5: (-s ours) am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894 * commit 'c6ba82b58e7a7207f19190a8b814ce8a131c109e': do not merge bug 3370834 Cherrypick from master CL 79894