| commit | aa0e8dc64949efd1fd2fbe1a3ece581651b0cf4d | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Tue May 29 18:17:18 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 29 18:17:18 2018 -0700 |
| tree | b5fb050ecef07e3f2020513a526f6a99f46554c4 | |
| parent | 26c5246d34694938dde4d35d17958a907bafd4b4 [diff] | |
| parent | 7dfc10392e86488b01981b3107f843d0be639834 [diff] |
[automerger skipped] Merge "Revert "Default to AAPT2 = false in AOSP only"" am: 035c5a35a6 am: 09db0149a0 -s ours am: 7dfc10392e -s ours Change-Id: I951d53053e14c8ab2ea8c47a93a0f706096631f8