| commit | cfe282d57028c0dd7b2d4245ecc5db35fa1ca9ce | [log] [tgz] |
|---|---|---|
| author | Luke Song <songwalker@google.com> | Thu Jul 20 03:36:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 20 03:36:07 2017 +0000 |
| tree | 120da9593d64de4e2cae6de70a148463e255a063 | |
| parent | 2e774b01f822efe1e433829b4c2b84068334430b [diff] | |
| parent | 1bc31284fa17582a626fa116954815a5dad9723e [diff] |
Merge "resolve merge conflicts of 74a5f22d9 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: 1bc31284fa Change-Id: I88dbbc655a602979a46736c59996dda00f0dfee1