| commit | 43dc8e5ecefa7bb75b5f5223cc407e5e48af7ec2 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Jul 09 21:03:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 09 21:03:52 2015 +0000 |
| tree | 94245f7e80a383c476c4755636f5c5ff7d9407f2 | |
| parent | 8e4dde2c80818df3c961b89332ecc30d5e1b8d73 [diff] | |
| parent | 8a5252fb46b279b713eef1f19e0a2c1f14d6f23e [diff] |
am 8a5252fb: am 2a67840c: Fix a bad merge. * commit '8a5252fb46b279b713eef1f19e0a2c1f14d6f23e': Fix a bad merge.