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