| commit | 041583989e02045641f9548412525f4fb17ce467 | [log] [tgz] |
|---|---|---|
| author | Adam Lesinski <adamlesinski@google.com> | Thu Aug 27 10:25:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:25:27 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 38043149103ca5b7e283cffe808b42913de06d84 [diff] | |
| parent | 9a9fd61e0b4a93ef36b13e4ff00621dd594b96cb [diff] |
am 9a9fd61e: (-s ours) am 0cd143ad: Merge "AAPT: Fix regression in resource versioning" into mnc-dev * commit '9a9fd61e0b4a93ef36b13e4ff00621dd594b96cb':