tree aa02e9782c50d4a625bef6834c23a74e300f5c2d
parent aa7e6a0d2b7518db75f3c67c74ece46f705e01c0
parent 6ea61f9c6db521a73d7b90dc2c670b93f328128b
author Adam Lesinski <adamlesinski@google.com> 1495849915 +0000
committer android-build-merger <android-build-merger@google.com> 1495849915 +0000

Merge "AAPT2: Follow symlinks when compiling" into oc-dev
am: 6ea61f9c6d

Change-Id: I18dc95b8adf503e0bf72e5b48036945dc95312de