diff options
| author | Chester Hsieh <dunno@google.com> | 2015-08-27 21:58:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:58:07 +0000 |
| commit | 2dad26a793232b1f27817ca50136cdacf95a8b42 (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | ac4d1571bc92a6a2e1f33377c364987c65eb9849 (diff) | |
| parent | 18f43342ab36eb6115f770f21fc60ffaefb237e2 (diff) | |
| download | idea-2dad26a793232b1f27817ca50136cdacf95a8b42.tar.gz | |
am 18f43342: am b596849b: (-s ours) am 2e1cf840: am 408227a7: Merge "resolve merge conflicts of 86bd093 to studio-1.4-dev." into studio-1.4-dev automerge: 554acd7 automerge: 0cc1b93
* commit '18f43342ab36eb6115f770f21fc60ffaefb237e2':
0 files changed, 0 insertions, 0 deletions