| commit | 3c64fb2ecf95af3569721afb0c5bc4fff6670f2c | [log] [tgz] |
|---|---|---|
| author | Tenghui Zhu <ztenghui@google.com> | Thu Aug 27 21:37:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:14 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | a5d1050b5aca40885769f2f9734d59c1ed1ea0f6 [diff] | |
| parent | a3d3eb2f24ec41f01dae920af8631dab5032dcaa [diff] |
am a3d3eb2f: am e7236641: (-s ours) am ecf1dabb: am 49784deb: Merge "Allow tweaking size, alpha and auto mirror in the UI." into studio-1.4-dev automerge: 452b7d6 automerge: 4e62f0f * commit 'a3d3eb2f24ec41f01dae920af8631dab5032dcaa':