tree 6d55a010fe25826f4cb2c77c751ebb08354681f2
parent 2378fa02610992365ccd46694b5b182858a7280e
parent 3d87193981c1eccaef58142225d0a3db3e55b749
author Tomasz Mikolajewski <mtomasz@google.com> 1480556320 +0000
committer android-build-merger <android-build-merger@google.com> 1480556320 +0000

Merge "resolve merge conflicts of 14afdcf to nougat-cts-dev" into nougat-cts-dev am: 24e2c82765 am: 8e6c1949e4 am: efc4b6e52b am: 76b5c7123d am: 90b9b93022
am: 3d87193981

Change-Id: Iae59ee2ce57cff5ca395e39a36939eb129a5f914