summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2019-05-02 16:06:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-02 16:06:23 +0000
commit7806a17ea686a9b2b993e36dd2de6ac18e9af2b6 (patch)
tree6023737e44405110da0f764591ab915fbd6076b8 /annotations/generate_annotated_java_files.py
parente82554e8ee596057818e9c8e87801822a1fb9b7a (diff)
parent524f64acb64a1f90629496a3e8f3cbcc619e167e (diff)
Merge "add .m2ts to video/mp2ts mimetype for Android" into qt-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions