tree f452c47cb7b11f25e96a04d41a6dc2b74fc39ce9
parent 5b5d9129134881f84ff80f5b16bce5e64670b545
parent e3b0119f79d11744a7f590510b184feef0f45894
author Adam Lesinski <adamlesinski@google.com> 1438302918 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438302918 +0000

am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev

* commit 'e3b0119f79d11744a7f590510b184feef0f45894':
  AAPT: Fix resource versioning