diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-09-26 14:04:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-09-26 14:04:57 +0000 |
| commit | fe9357f6e76a0dd3ea224fcb797c77994842ad60 (patch) | |
| tree | 101c7a81bcefe309743ab70a053d15e574eb9dc1 /tools/aapt2/diff/Diff.cpp | |
| parent | 1dd012a41a300fe7a9c5ce5351b217f112869341 (diff) | |
| parent | b4fcc6136e25d46af460d4cb99b8f5f279bfb5db (diff) | |
Merge changes from topic 'aosp-generics-api'
* 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/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions