tree 9a63118b4c67ff4b6cea585dc65bd011152db401
parent d78520192a73166c905d8df2ddb272de674045e2
parent 64587af8179affd38ee26543b748f2d63b7f67bb
author Adam Lesinski <adamlesinski@google.com> 1457135208 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1457135209 +0000

Merge "AAPT2: Support building, linking, and merging static libraries" into nyc-dev