| commit | 40a1708ea42909145bef8e4d5173d89d1e17af78 | [log] [tgz] |
|---|---|---|
| author | Jerome Gaillard <jgaillard@google.com> | Thu Aug 27 21:59:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:59:44 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 473435800561c7e85d28249e0ef9362537da2900 [diff] | |
| parent | 60ee92a9ba1abeba01f59a09ed3461d71e9c35ec [diff] |
am 60ee92a9: am d78e1a0f: (-s ours) am 6ecdfeee: am bc5daa9e: Merge "Fix UI of configuration toolbar" into studio-1.4-dev automerge: a829377 automerge: 2b8c30c * commit '60ee92a9ba1abeba01f59a09ed3461d71e9c35ec':