summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Norbye <tnorbye@google.com>2015-08-27 11:14:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 11:14:42 +0000
commit45ad5ef977f47c38334ad028906bc07a21732366 (patch)
treebe637547c725febd189f8b263693db6557ddaa7d
parentc4a50a242e17f6d0e1a3317bf1c1da006b548687 (diff)
parentd989ca95a4487c0fa5d7461ad5024dc4f7721a3c (diff)
downloadidea-45ad5ef977f47c38334ad028906bc07a21732366.tar.gz
am d989ca95: (-s ours) am 20d4f66a: am 98bd7b41: Merge "Use SDK version check rather than @TargetApi for API warnings" into studio-1.4-dev automerge: b9c994b automerge: 0ad91ee
* commit 'd989ca95a4487c0fa5d7461ad5024dc4f7721a3c':
0 files changed, 0 insertions, 0 deletions