| commit | 663243935409363f709ea2bfcb800b3c45c38e8b | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:37:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:54 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 409bb515cf662127ecbc2ee09624e2e36bee81a2 [diff] | |
| parent | 32ad5e7ba05d29245e6d86141c260fd17b90a87e [diff] |
am 32ad5e7b: am 8c4e0f1a: (-s ours) am 9ecb5ebd: am 2c6dda6b: Merge "Make asset studio module depend on sdk-common-base" into studio-1.4-dev automerge: 5408b74 automerge: 295883c * commit '32ad5e7ba05d29245e6d86141c260fd17b90a87e':