| commit | bfd30636853260f45294920e30cf8e1736e6fb8e | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Thu Aug 10 01:10:54 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Aug 10 01:10:54 2017 +0000 |
| tree | 7e6bcf3055b032e5d5e755e364ac427e7f1fbc41 | |
| parent | 5a3442150261e2a06f82956903cdcae103949aae [diff] | |
| parent | e52d9c5b83aac7f9ddfaa68a5ee1dac30fa2b242 [diff] |
Merge "resolve merge conflicts of 40da4609e to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: e52d9c5b83 Change-Id: I2d9963bf30f8d36a106135eff1f96298d110da39