| commit | aa2fa959eedadd249d98d02776b512f3835ded97 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Sat Aug 12 03:48:38 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Aug 12 03:48:38 2017 +0000 |
| tree | fe4f753ad7196d3ceea37cc90bc5c273910cc54b | |
| parent | 79fa0417628ff1ac97579eaa3bfa9b7665fc2696 [diff] | |
| parent | 4126f4651fe8b395bf848babb0fb2af44dded478 [diff] |
Merge "Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master am: e59c1b1b50 am: bc6d35e698 am: 8e22616fb8" into oc-mr1-dev-plus-aosp