| commit | 0bff26c1e9f96857fced59e42a6dac67c14a5597 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Jul 09 22:30:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 09 22:30:24 2015 +0000 |
| tree | 778ea0d149d3876dac005f1dcb47041d488487d6 | |
| parent | 5c43bb82e44f0ab9650f15a0392284a2e91feed4 [diff] | |
| parent | 9c22afe8538cd8c849d0393751bf5bc4997bc632 [diff] |
am 9c22afe8: Fix a bad merge. * commit '9c22afe8538cd8c849d0393751bf5bc4997bc632': Fix a bad merge.