tree 6d3a48040a6e4797ed4487b82562a4428f5adb32
parent a56a0e59e051f64383a2e24f861263d37823818f
parent 98b91c958ce0d12ca4332a16167694c0751ecbb4
author Bjoern Johansson <bjoernj@google.com> 1487705318 +0000
committer android-build-merger <android-build-merger@google.com> 1487705318 +0000

Merge "Merge "resolve merge conflicts of dfc0ec200f to nougat-mr1-cts-dev" into nougat-mr1-cts-dev am: 4acb742c40 am: 1760c2406a am: b2ecabdbe3 am: 481142bda3" into nyc-mr2-dev-plus-aosp
am: 98b91c958c

Change-Id: Ia1f7cd26e8aceda333ad3971c4105591f21619a6