| commit | 8a5252fb46b279b713eef1f19e0a2c1f14d6f23e | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Jul 09 20:47:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 09 20:47:34 2015 +0000 |
| tree | d388a27a88be6095710a50560ba05b897446c1b3 | |
| parent | 2ad03d0c3275c902d6c86dcef8f4bd91183d397f [diff] | |
| parent | 2a67840c3c35a6267663e5d3ae921ee9ac614db9 [diff] |
am 2a67840c: Fix a bad merge. * commit '2a67840c3c35a6267663e5d3ae921ee9ac614db9': Fix a bad merge.