summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Warrington <cmw@google.com>2015-08-27 21:37:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:37:38 +0000
commit153a6277bcd4a55fca66e46e304da0c29ecab3df (patch)
treeff5bf30242ff444d41cfeb257d4914bb38905b2e
parent3295d292863b2b8d01e798fcbb9e65f79b0e872c (diff)
parent32a660b3a399a0e03e1fdb8e930e6e0871524bc0 (diff)
downloadbase-153a6277bcd4a55fca66e46e304da0c29ecab3df.tar.gz
am 32a660b3: am 523def1d: (-s ours) am ac85cf78: am f8342a9e: Merge "Allow multiple serial numbers in ANDROID_SERIAL." into studio-1.4-dev automerge: 75f8bef automerge: 849a260
* commit '32a660b3a399a0e03e1fdb8e930e6e0871524bc0':
0 files changed, 0 insertions, 0 deletions