| commit | a2d6390fdbbaaa2b796d1119ed9f8678364dccdd | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue May 16 01:48:01 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 16 01:48:01 2017 +0000 |
| tree | 6589a2831784a580a0c93c7bbc89cb541a297344 | |
| parent | 965a4b5291eead2d8f826d2c87e58a12bb56a214 [diff] | |
| parent | 7b7f0b469ad512b9b5c759344eb0663e7c2eb191 [diff] |
resolve merge conflicts of 4f1b2ce to oc-dev-plus-aosp am: 7b7f0b469a Change-Id: Ic6605c6b8bfbc73fb25e0941df265db53604f719