OSDN Git Service

am 9a9fd61e: (-s ours) am 0cd143ad: Merge "AAPT: Fix regression in resource versionin...
authorAdam Lesinski <adamlesinski@google.com>
Thu, 27 Aug 2015 10:25:27 +0000 (10:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:25:27 +0000 (10:25 +0000)
commit041583989e02045641f9548412525f4fb17ce467
tree715d547d2502de8d04de0ec12233b3183ce62c99
parent38043149103ca5b7e283cffe808b42913de06d84
parent9a9fd61e0b4a93ef36b13e4ff00621dd594b96cb
am 9a9fd61e: (-s ours) am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev

* commit '9a9fd61e0b4a93ef36b13e4ff00621dd594b96cb':