diff options
| author | Andrew Shulaev <ddrone@google.com> | 2015-08-27 21:55:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:55:55 +0000 |
| commit | dd15c646b80a1ec8deed40e20ca85266c4b44e40 (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 1a3194f28c7c91b93609212d57ebc5c0345bcfc0 (diff) | |
| parent | 46732275bd812b06e4edce1f06d6a2e87954fa3d (diff) | |
| download | idea-dd15c646b80a1ec8deed40e20ca85266c4b44e40.tar.gz | |
am 46732275: am 28559ac1: (-s ours) am 96e4fd6e: am 3c83c957: Merge "Fix parents resolution for themes which parent reside in another module" into studio-1.4-dev automerge: 17f2be7 automerge: 7f8f76e
* commit '46732275bd812b06e4edce1f06d6a2e87954fa3d':
0 files changed, 0 insertions, 0 deletions