| commit | 8e22616fb80fa5fbad9b4f529beec1470c0da3f1 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Aug 11 22:17:51 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 11 22:17:51 2017 +0000 |
| tree | ebb3c3de283afc98bce3381fde1074322c8b048a | |
| parent | 39af219c231f22d7d783969436316282535c3ab0 [diff] | |
| parent | bc6d35e6983e96ad454ec9bc70410da5eb6d8fa9 [diff] |
Merge "Revert "aapt2_jni: use proper nativehelper headers"" into stage-aosp-master am: e59c1b1b50 am: bc6d35e698 Change-Id: Ida9cc1c9c2a64920ce094f2305e2e7bc1abaec1b