diff options
author | Tor Norbye <tnorbye@google.com> | 2015-08-27 21:57:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:57:48 +0000 |
commit | 967b51b425e170107c7242fa3264cc9b16c7da75 (patch) | |
tree | be637547c725febd189f8b263693db6557ddaa7d | |
parent | a3ae507ac44647b09e5c0d0649d48e31fc01787c (diff) | |
parent | 45ad5ef977f47c38334ad028906bc07a21732366 (diff) | |
download | idea-967b51b425e170107c7242fa3264cc9b16c7da75.tar.gz |
am 45ad5ef9: 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 '45ad5ef977f47c38334ad028906bc07a21732366':
0 files changed, 0 insertions, 0 deletions