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