diff options
| author | Tor Norbye <tnorbye@google.com> | 2015-08-27 11:15:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 11:15:17 +0000 |
| commit | bcebc1975592c6ffd0cfe887c6b1463808373b1f (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 172f80ecd6fc2800ec634d640ca7b3718f5bd4e7 (diff) | |
| parent | e38c3ca86180f6ea3126b2333e3164c266632e6e (diff) | |
| download | idea-bcebc1975592c6ffd0cfe887c6b1463808373b1f.tar.gz | |
am e38c3ca8: (-s ours) am 67c7e1f3: am 4a6b9477: Merge "resolve merge conflicts of 245ed49 to studio-1.4-dev." into studio-1.4-dev automerge: d0a7dfb automerge: 1c50128
* commit 'e38c3ca86180f6ea3126b2333e3164c266632e6e':
0 files changed, 0 insertions, 0 deletions