tree e6592087fe175604a95ba5e9eb034f350bb990f7
parent add95c01b9d4d69ab22a7524309aa2e13f0ee873
parent af1177453d95d727651cf48a380d7979dc94ae45
author TreeHugger Robot <treehugger-gerrit@google.com> 1494896708 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494896709 +0000

Merge "Revert "Use AAPT2"" into oc-dev