| commit | 26d17119a582a9be8a95a81646dfa2ac8638a49f | [log] [tgz] |
|---|---|---|
| author | Rubin Xu <rubinxu@google.com> | Mon Nov 06 23:14:16 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Nov 06 23:14:16 2017 +0000 |
| tree | 39fb0ba2319e741f7c71f66dbf06fdf0909186c2 | |
| parent | bfb01d904d403087d096658d3830b34d0f931714 [diff] | |
| parent | 0010dae9ffc58f076614db3fc2ee4c44062b16c5 [diff] |
resolve merge conflicts of 2b93ec4 to oc-dr1-dev am: 0010dae9ff -s ours Change-Id: Ie076c74cbed08183383210d36b4761842ec37c49