diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-06-08 22:06:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-08 22:06:34 +0000 |
| commit | fb5e29f70f87433916b6d7275c6ce08ca8d1c46c (patch) | |
| tree | 7f0dbb20d6362f1b5d57832b0da4d3ee6b3e1e52 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ca43434a2d661530641bc106fb6aca61a03bd09e (diff) | |
| parent | 4c7698f631f6e2c2677bc10ceaca44e6541bdb29 (diff) | |
Merge changes I576a8fe5,Ib8ed481e
* changes:
Don't touch NetworkSecurityPolicy in ActivityThread
Don't depend directly on AppplicationInfo
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions