diff options
author | Diego Perez <diegoperez@google.com> | 2015-08-27 21:58:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:58:45 +0000 |
commit | 6a94b444fbbfdcff4126ff5c33b88c7cf9a230d7 (patch) | |
tree | be637547c725febd189f8b263693db6557ddaa7d | |
parent | 6fa7e0e0ada21851364a864b0607c61e98ba600e (diff) | |
parent | 4827508b010f934d839ef6f8904886bee53dc266 (diff) | |
download | idea-6a94b444fbbfdcff4126ff5c33b88c7cf9a230d7.tar.gz |
am 4827508b: am 7d025240: (-s ours) am 9703be4c: am 6d957562: Merge "Fix simple mode sorting and UI tests" into studio-1.4-dev automerge: 74e54a7 automerge: e8239b0
* commit '4827508b010f934d839ef6f8904886bee53dc266':
0 files changed, 0 insertions, 0 deletions