commit | ef6b8ea3f664254958491f48fbe38c502d1129df | [log] [tgz] |
---|---|---|
author | Jean-Michel Trivi <jmtrivi@google.com> | Wed Jan 26 14:05:25 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 26 14:05:25 2011 -0800 |
tree | 06231f05a310f6ed83255a0af051d429c36d672e | |
parent | 14e362617ceb67f1ae3dd09e0f7744860b5ee066 [diff] | |
parent | 17f1ff8c99dada2cca93f68d434cf64a6dc692c2 [diff] |
am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894 * commit '17f1ff8c99dada2cca93f68d434cf64a6dc692c2': do not merge bug 3370834 Cherrypick from master CL 79894