diff options
author | Alex Klyubin <klyubin@google.com> | 2017-05-09 22:59:37 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-09 22:59:37 +0000 |
commit | 38039d8716b9d84c42502441c1eca483184f79e2 (patch) | |
tree | bb07cbba55af683485991a92df85630de69c6bd6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d0d08382183edfb01246218950847b66bfcb1cc3 (diff) | |
parent | 9e79409e6f8d72137e2b1da2068f9ec177bbd6e2 (diff) |
Merge "Merge "Merge "Switch from libcrypto_static to libcrypto target" am: 4ad5256547 am: 44eb369c83" into nyc-mr2-dev-plus-aosp am: 473e674143" into oc-dev-plus-aosp
am: 9e79409e6f
Change-Id: Ie678a26b02ce7b50130dbc003ef5e30528a4b3c6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions