summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Bendowski <bendowski@google.com>2015-08-27 21:37:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:37:55 +0000
commit67577dd5de85746269ac8855ce1d1748152766d2 (patch)
treeff5bf30242ff444d41cfeb257d4914bb38905b2e
parent663243935409363f709ea2bfcb800b3c45c38e8b (diff)
parent1d7018aae9a7cf7e4ffdeb91e25224057456e5c7 (diff)
downloadbase-67577dd5de85746269ac8855ce1d1748152766d2.tar.gz
am 1d7018aa: am 75cae261: (-s ours) am 9de94ae0: am 8737cb1c: Merge "changelog.txt: fix a typo to correctly refer to "unitTests.all"" into studio-1.4-dev automerge: 827d0c8 automerge: d36c75c
* commit '1d7018aae9a7cf7e4ffdeb91e25224057456e5c7':
0 files changed, 0 insertions, 0 deletions