summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaymond Chiu <chiur@google.com>2015-08-27 21:37:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:37:41 +0000
commitc2746476cce4eb2fdbf3df01b1d4c77fd2140356 (patch)
treeff5bf30242ff444d41cfeb257d4914bb38905b2e
parent153a6277bcd4a55fca66e46e304da0c29ecab3df (diff)
parent41cfd244943c31172155c850a1ab480c5645120c (diff)
downloadbase-c2746476cce4eb2fdbf3df01b1d4c77fd2140356.tar.gz
am 41cfd244: am 743ef569: (-s ours) am 18e499f9: am 79352dd5: Merge "Add test for variant specific NDK config" into studio-1.4-dev automerge: 152f5dc automerge: d83cb6a
* commit '41cfd244943c31172155c850a1ab480c5645120c':
0 files changed, 0 insertions, 0 deletions