diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-09-28 21:47:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-28 21:47:54 +0000 |
| commit | f8243e1e99827542e854f2916146fe4cd1c65cf5 (patch) | |
| tree | 24131c293845b005b76f51d39437108909f1d7c1 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 62bceaabe9e8e993a541f88e098de1df8edc7f53 (diff) | |
| parent | ae0c402a456c54b3b400ebab14a33c187cfb7ead (diff) | |
Merge changes from topic 'stage-aosp-master-generics-api' into stage-aosp-master
* changes:
DO NOT MERGE Track generics in API definition.
DO NOT MERGE Fix issue #29871385: Need JobScheduler.scheduleAsPackage to be system API
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions