tree 4a021028ae77008978e661814740931be6f34a8f
parent a499fe9b094dceed16f8363d48b6edd6ab4d1a01
parent 6dc384b585f4867d4f5c7a3c16a009aada48dd8c
author Ross Yeh <rossyeh@google.com> 1527012704 -0700
committer android-build-merger <android-build-merger@google.com> 1527012704 -0700

Merge "resolve merge conflicts of cedcbbd0278dfec5d40e152c5ea822e671d0e8e1 to nougat-cts-dev" into nougat-cts-dev
am: 6dc384b585

Change-Id: I0d9df0b436cc7f83355e86bfe41db4ede08ec689