David Brazdil f8d22dec87 resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master ...

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ide3c4e229b47e4242cacafc04b70d8b392712cc8

2018-07-11 11:56:34 +01:00

..

api

…

src/android/test/mock

…

Android.bp

resolve merge conflicts of 6e3c86c8ed7a1bcfcbc63bbded0043d4b4efbe10 to stage-aosp-master

2018-07-11 11:56:34 +01:00

Android.mk

…

jarjar-rules.txt

…