diff options
| author | Jens Ole Lauridsen <jlauridsen@google.com> | 2015-08-27 21:55:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:55:22 +0000 |
| commit | f17c8a101f319eca0d59fa11030a6250cba13050 (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | b6d52ddc021763586a5bc4f61d8d229a7a37f8b7 (diff) | |
| parent | 0d3c6eb7f7017cf9a7423978b1592e72a6a36b6e (diff) | |
| download | idea-f17c8a101f319eca0d59fa11030a6250cba13050.tar.gz | |
am 0d3c6eb7: am bb913cf5: (-s ours) am 6c920069: am fe3cc38a: Merge "Nele: Fix the disposing of the palette and structure pane." into studio-1.4-dev automerge: bbda85e automerge: 3aac648
* commit '0d3c6eb7f7017cf9a7423978b1592e72a6a36b6e':
0 files changed, 0 insertions, 0 deletions