tree fb1148d3d9eb91ffc2529e34ba48ef457e1a14f8
parent b44ddbb5b341d3cc8206537b026c7cb433aa2cba
parent 1a1461058e6b5a9be28f01cc0b87900a011ea585
author Adam Lesinski <adamlesinski@google.com> 1462925344 +0000
committer android-build-merger <android-build-merger@google.com> 1462925344 +0000

Merge "AAPT2: Add diff command" into nyc-mr1-dev
am: 1a1461058e

* commit '1a1461058e6b5a9be28f01cc0b87900a011ea585':
  AAPT2: Add diff command

Change-Id: If3d31d9cb52cb49e0238d01c5391e25cf36a7222