tree 96e69f8261c4777867db7586057583939bfda302
parent 1fb235aa9ba032c69a93907e349a71352718f85d
parent 397001b2a7cb184e4916688b7ecfdcdc439be818
author Adam Lesinski <adamlesinski@google.com> 1412374623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412374623 +0000

am 397001b2: am a80aba70: Merge "AAPT: Gate v21 resource synthesizing logging behind -v flag" into lmp-dev

* commit '397001b2a7cb184e4916688b7ecfdcdc439be818':
  AAPT: Gate v21 resource synthesizing logging behind -v flag