summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-08-27 21:58:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:58:13 +0000
commit5481478fc775e950f18d45b5b71c3e2bbcdd0e33 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parent9807c40703b80f070914578c8a13233ee8fb2c63 (diff)
parent5d2854d12dae879997f1393a205b744cae6dbf17 (diff)
downloadidea-5481478fc775e950f18d45b5b71c3e2bbcdd0e33.tar.gz
am 5d2854d1: am 486b868e: (-s ours) am 02397bb0: am 3e90745c: Merge "b/22628881: Tweak toolbar wording" into studio-1.3-dev automerge: 25bc518 automerge: f9a3774 automerge: 017e1e7
* commit '5d2854d12dae879997f1393a205b744cae6dbf17':
0 files changed, 0 insertions, 0 deletions