summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2015-08-27 21:37:13 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-27 21:37:13 +0000
commita5d1050b5aca40885769f2f9734d59c1ed1ea0f6 (patch)
treeff5bf30242ff444d41cfeb257d4914bb38905b2e
parent7d6d349090b1852d4a07cf923a0bab4c7d175b12 (diff)
parent644027a9dd2f587ad6dcceb979965cb1f1fd6ce2 (diff)
downloadbase-a5d1050b5aca40885769f2f9734d59c1ed1ea0f6.tar.gz
am 644027a9: am 50f4bd19: (-s ours) am 0e86ef46: am bf8169fc: Merge "Change retention policy of annotations from class to source" into studio-1.4-dev automerge: 6daea43 automerge: dd18cf4
* commit '644027a9dd2f587ad6dcceb979965cb1f1fd6ce2':
0 files changed, 0 insertions, 0 deletions