| commit | 70148def0236be5b2807920611f20a94ec184c88 | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon Nov 06 23:23:48 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 06 23:23:48 2017 +0000 |
| tree | 23c1b3113a9f5aed89bc21e2c0c01bf94807e248 | |
| parent | 680744295344c0404b15f898d6818d342befbfb4 [diff] | |
| parent | 26d17119a582a9be8a95a81646dfa2ac8638a49f [diff] |
resolve merge conflicts of 2b93ec4 to oc-dr1-dev am: 0010dae9ff -s ours am: 26d17119a5 -s ours Change-Id: I722c862f0980af8d457e431499a95ee5ca15a643