diff options
| author | Xin Li <delphij@google.com> | 2019-05-09 18:23:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-09 18:23:41 -0700 |
| commit | b9a86a7dc58c9d94bc1a6123854b41f0e9229c41 (patch) | |
| tree | fcc6bba616b257eb407c896d7f69e66f745b0c78 /annotations/generate_annotated_java_files.py | |
| parent | dde61414ce1cd30587d9290b026a2a2c12da725f (diff) | |
| parent | a9ac3a1c83503edbc4c105b45424192f4a07e83a (diff) | |
[automerger skipped] Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
am: a9ac3a1c83 -s ours
am skip reason: subject contains skip directive
Change-Id: I0ca8b10a01ac2a8055981cd48519b3a755d3597f
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions