| commit | a9b933680b81642b4498c2db1d91f7ea4982d7f6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 16 02:01:33 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 02:01:33 2017 +0000 |
| tree | c99c1f63716e7286ebfb83a0c78d91be06ec8488 | |
| parent | e2e3bd11bd7561bc9d6686283a668fa94e1206b7 [diff] | |
| parent | 5c80f87b56474c42c598880611a29ae013bef07a [diff] |
resolve merge conflicts of 26a1a54 to oc-dev-plus-aosp am: 5c80f87b56 Change-Id: I77d815113792fb767733631a7cc9f7ab2b3a6593