Shaotang Li 882f4e1f44 resolve merge conflicts of b825510b80 to stage-aosp-master ...

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

2018-08-30 05:26:19 +00:00

..

src

resolve merge conflicts of b825510b80 to stage-aosp-master

2018-08-30 05:26:19 +00:00

Android.bp

Pin jarjar targets to java_version 1.8.

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

jarjar-rules.txt

…