diff options
| author | Xin Li <delphij@google.com> | 2017-01-13 22:09:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-13 22:09:06 +0000 |
| commit | 9f8d1b9299414b57eff21c6a540d207ca9722fdc (patch) | |
| tree | e92c5f6d19c9cb3b5ca9e42071fbc000e45b94ac /annotations/generate_annotated_java_files.py | |
| parent | 8ecb443d45cc435187807c97ba09b136bc62f0ab (diff) | |
| parent | b43e88bc8004dfbc0cc90ff74dfb00821b67016a (diff) | |
Merge "Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev." into nougat-mr1-cts-dev am: 510a2eff8f
am: b43e88bc80
Change-Id: Iafe1d7ffbb4031ea6af06f0f0afc0119e8f27cff
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions