Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
authorTina Zhou <tinazh@google.com>
Thu, 22 Dec 2016 02:50:53 +0000 (02:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Dec 2016 02:50:53 +0000 (02:50 +0000)
commitaa9cd15468aebf98e15ed65954e1dda5b150c0ae
tree9f6fd349c68314431733a3ca8b12015910eb04a5
parent62f7b49be72b0c131d5dcd2e759638015a34272e
parenta911a0455642e6cc012faf536575d393390812ae
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: f2ab59be70
am: a911a04556

Change-Id: Ia3502fed8bfae8e24843ffedfd1beea34c6553b8