| commit | f038be3bf8d66899388867fc0b2fe606c2f33c5e | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Aug 03 22:38:26 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 03 22:38:26 2017 +0000 |
| tree | 52ce0381774132a25b1e16a7205133ef6af2f37f | |
| parent | 5b1c4bc2c8ed02f8e59ca1beb7ca66e36427e03d [diff] | |
| parent | 6eca208fdd8a59fea99ce2538cadb055fd590cb6 [diff] |
resolve merge conflicts of 7819b01 to oc-mr1-dev-plus-aosp am: 6eca208fdd Change-Id: I82af68346c6a09f09799480f6d01a6d671ce2e3f