| commit | d1c734d5cdfedec75cbb8e2d165c7bdf2627983c | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Jan 22 10:17:33 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jan 22 10:17:33 2019 -0800 |
| tree | b78f1301a77066fba95b9143c2169ebc6f122a8b | |
| parent | 2b43d4e500065e667639d454361edb1a8b82a55d [diff] | |
| parent | f84f74d09aab274aa72e976d7646e463edd9d2fb [diff] |
Merge "Merge "resolve merge conflicts of 8066d615918530df2cac61538fa66bf459298f92 to oreo-cts-dev" into oreo-cts-dev am: dc171e2e28" into oreo-mr1-cts-dev am: f84f74d09a Change-Id: Iea7d3ce8f7bad8c087978ac70ef32e225e7dfd82