| commit | 6c117064452c32512d41243c254983bfc129ef5a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jun 29 01:45:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jun 29 01:45:03 2017 +0000 |
| tree | 6362e52c805ee00287afd01450a59f6b51572536 | |
| parent | 1413760a1a8fbc84c13ce310880a47f7cec95d19 [diff] | |
| parent | 5748ca639c159cc2fde77f81c1d7ec2f596a4fcf [diff] |
Merge "resolve merge conflicts of 712b628d7 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: 730c5d09c6 Change-Id: Iae72c8105f38f9eaa0f6143727bd5de310300311