summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-09-01 10:06:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-01 10:06:53 +0000
commit61d1c8f603f33a788add550bdf46711f356ac506 (patch)
tree6770798b4a4f67f62a5450ac91c94dc8f51a197a /annotations/generate_annotated_java_files.py
parentc510037b2835ad36a559f7af672f3036ed40c750 (diff)
parentf86ad679780b7464c522bf48c8b7281a306862bd (diff)
am f86ad679: am 2d459b82: am 660504ac: Merge "Fixes and improvements for SerializationTest" into lollipop-cts-dev
* commit 'f86ad679780b7464c522bf48c8b7281a306862bd':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions