| commit | 6ac1763521c0d2c4380b6907de51c1ef051734cc | [log] [tgz] |
|---|---|---|
| author | Tobias Thierer <tobiast@google.com> | Thu Oct 19 17:10:40 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Oct 19 17:10:40 2017 +0000 |
| tree | 44d8c4c467bf4a26fba82fb6956c8d7057da6c44 | |
| parent | 8cb2dcf08184c32d00e2f40cba9666f6eab80970 [diff] | |
| parent | 301bf35e2df9e3f2efa5dbf1c2df69e10be7f6e8 [diff] |
resolve merge conflicts of 5c9e47d28b24 to oc-mr1-dev-plus-aosp am: 301bf35e2d -s ours Change-Id: I94dc1b71d6c9a323173b75b2d71b7da841c460d9