summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Perez <diegoperez@google.com>2015-08-27 11:15:12 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 11:15:12 +0000
commit4827508b010f934d839ef6f8904886bee53dc266 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent957af89ab221cabdda9a0874f7745bd280b7f7ac (diff)
parent7d025240543fc2cf33aaa6b80017169a0eb1f660 (diff)
downloadidea-4827508b010f934d839ef6f8904886bee53dc266.tar.gz
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 '7d025240543fc2cf33aaa6b80017169a0eb1f660':
0 files changed, 0 insertions, 0 deletions