| commit | efdc4521f5efa8805e9ce7aeb134e4bb5351f8b7 | [log] [tgz] |
|---|---|---|
| author | Michal Bendowski <bendowski@google.com> | Thu Aug 27 12:14:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:14:29 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 5715016b1e835c2dd00b4a3688af86fec314ac14 [diff] | |
| parent | fca9c770fc537b7d6d726fee54bf068021f0c7bf [diff] |
am fca9c770: (-s ours) am 9416a180: am 00994986: Merge "Generate PNGs during resource merging." into studio-1.4-dev automerge: cab7a69 automerge: b41a136 * commit 'fca9c770fc537b7d6d726fee54bf068021f0c7bf':