diff options
| author | Xin Li <delphij@google.com> | 2017-02-21 19:14:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-21 19:14:04 +0000 |
| commit | c21491f13f244703dfd059d940c2380904701ed2 (patch) | |
| tree | 8d47d9e7448268dcd41969638cbd406f95da7341 /annotations/generate_annotated_java_files.py | |
| parent | d5921a4b15d386de0e6ed909d6e3c8047c4ac761 (diff) | |
| parent | 510a2eff8f6a91ddb3204e0e10ca3545fc221b8b (diff) | |
Merge "Merge commit '9f37302e67fae7450cf85e17a8f7c50c7d622929' into nougat-mr1-cts-dev." into nougat-mr1-cts-dev
am: 510a2eff8f
Change-Id: I2b6ec560560e250a0ea6309238b55475aa2e139b
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions