summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYohann Roussel <yroussel@google.com>2015-03-20 22:09:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 22:09:10 +0000
commita307a4858c4a0d2c3c3fa782132e4407b388997c (patch)
tree70c8970fcd27420583f66bdbf5b975b79d896021
parentd90b7c8b16455735653c25f8853b8b9c712fc7d9 (diff)
parentfe7853cb8e7462cd89da5a7b7cfda08a5e4bbe75 (diff)
downloadandroid_dalvik-a307a4858c4a0d2c3c3fa782132e4407b388997c.tar.gz
android_dalvik-a307a4858c4a0d2c3c3fa782132e4407b388997c.tar.bz2
android_dalvik-a307a4858c4a0d2c3c3fa782132e4407b388997c.zip
am fe7853cb: am f66091f0: Merge "Keep all annotation in main dex."
* commit 'fe7853cb8e7462cd89da5a7b7cfda08a5e4bbe75': Keep all annotation in main dex.
0 files changed, 0 insertions, 0 deletions