summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Bendowski <bendowski@google.com>2015-08-27 12:16:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 12:16:29 +0000
commit1d7018aae9a7cf7e4ffdeb91e25224057456e5c7 (patch)
treeff5bf30242ff444d41cfeb257d4914bb38905b2e
parent32ad5e7ba05d29245e6d86141c260fd17b90a87e (diff)
parent75cae2616d6879a4adcb8cd99ab00630981106f2 (diff)
downloadbase-1d7018aae9a7cf7e4ffdeb91e25224057456e5c7.tar.gz
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 '75cae2616d6879a4adcb8cd99ab00630981106f2':
0 files changed, 0 insertions, 0 deletions