commit | 3d6f370bccf158e93b37cfce0502d9f9211857c6 | [log] [tgz] |
---|---|---|
author | jupengfei <jupengfei@bbktel.com> | Tue Feb 20 21:55:57 2018 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Feb 20 21:55:57 2018 +0000 |
tree | 8b578e37635366f7d8daef3d04fac66f31f6eed9 | |
parent | 618cb077e62467cb7c7f51290557c84273da700e [diff] | |
parent | 637e5f7d3c593d2bb50c86f4cfc84cae4f997833 [diff] |
Merge "Merge "Merge "Merge "remove zoomcontrols from ThemeDeviceTest" into oreo-cts-dev am: 4e8a88c7cb" into oreo-mr1-cts-dev am: c8457c2214" am: d16f7aea45 am: 50217e7287" into oc-mr1-dev-plus-aosp am: 637e5f7d3c Change-Id: I0d30e4761fcb6d6299c8479ce655661b6cb0f83c