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