diff options
| author | Xin Li <delphij@google.com> | 2017-02-21 19:13:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-21 19:13:54 +0000 |
| commit | d5921a4b15d386de0e6ed909d6e3c8047c4ac761 (patch) | |
| tree | 8d47d9e7448268dcd41969638cbd406f95da7341 /annotations/generate_annotated_java_files.py | |
| parent | d8d91b2f6de11f3f8a13d89434a0a2eb4defdb4c (diff) | |
| parent | 1c26d74db14dfedee30a4f37848edd5b8d0f3e23 (diff) | |
Merge "Merge commit 'fc575bca313624a7cba20171fbaa625bbc852cd4' into nougat-mr1-cts-dev" into nougat-mr1-cts-dev
am: 1c26d74db1
Change-Id: I11c4bb0ea9622f70238c89f696fdb7a8e6ee747d
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions