Shaotang Li aa68114d8b resolve merge conflicts of 882f4e1f44 to pi-dev-plus-aosp ...

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I4d0c3c9420e5c7af697be74521040040284a2299
Merged-In: I2eb6965238e37435bb380fb4a0e616bd1da6dae6

2018-08-30 10:39:15 +00:00

..

src

resolve merge conflicts of 882f4e1f44 to pi-dev-plus-aosp

2018-08-30 10:39:15 +00:00

Android.bp

Pin jarjar targets to java_version 1.8.

2018-02-05 21:14:24 +00:00

jarjar-rules.txt

…