| commit | ef2ec2847637300866e29eda52323c232c2a8339 | [log] [tgz] |
|---|---|---|
| author | John Grossman <johngro@google.com> | Thu Jun 28 13:28:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 28 13:28:22 2012 -0700 |
| tree | 4cfc65e97177d73c7a9c94b480805860c09b5ef8 | |
| parent | f16b211ebfe36544bae832f9b9968b9640720be3 [diff] | |
| parent | 194f6bc7ceac43884f62c2481f5c8d76db9320c5 [diff] |
am 194f6bc7: (-s ours) Fix for bug 6691452 : DO NOT MERGE * commit '194f6bc7ceac43884f62c2481f5c8d76db9320c5': Fix for bug 6691452 : DO NOT MERGE