| commit | 1a813f5330fc04e1216d3584ddfc63608c4c4f5c | [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 | 951ec5fbf335dfcfa137460ea6ff4ab518ff2880 [diff] | |
| parent | cc2e8d37e15459a58e839938bf7d8248b0f06164 [diff] |
Merge "resolve merge conflicts of 74a5f22d9 to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp am: 1bc31284fa Change-Id: I88dbbc655a602979a46736c59996dda00f0dfee1