diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-07-08 12:35:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-08 12:35:04 -0700 |
| commit | bd6f9b609efe30525e4a6f612e0a5aa61ceae224 (patch) | |
| tree | 5f5c735a26be664c3ce80ccd4677609b59d93725 /annotations/generate_annotated_java_files.py | |
| parent | 7f649edc647081ac299742607d7c497486ff41a7 (diff) | |
| parent | 5288ef70edc3c2b12794a9d018c0aaa953ccebf4 (diff) | |
am 5288ef70: (-s ours) resolved conflicts for merge of 1cec2593 to jb-mr1-dev-plus-aosp
* commit '5288ef70edc3c2b12794a9d018c0aaa953ccebf4':
Values in ZIP files are unsigned.
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions