summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-08-27 21:58:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:58:32 +0000
commitfa7c48958144cf31844b2e831b52cf169ae354ce (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parenta6ade21500aed99848e9a1b5bc4f7f087e07e091 (diff)
parent4d909fcae150a63d4ffa122d41d9abcc5ea578b0 (diff)
downloadidea-fa7c48958144cf31844b2e831b52cf169ae354ce.tar.gz
am 4d909fca: am 46984bef: (-s ours) am 380c8612: am 15c0ae4b: Merge "Update builder-model to 1.3.0" into studio-1.3-dev automerge: 47eef8b automerge: e5c2d67 automerge: 54ce143
* commit '4d909fcae150a63d4ffa122d41d9abcc5ea578b0':
0 files changed, 0 insertions, 0 deletions