diff options
| author | Xin Li <delphij@google.com> | 2016-06-07 18:03:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-07 18:03:36 +0000 |
| commit | 1a0bc037bb32642e75152d4822ae818b61c32286 (patch) | |
| tree | b2afa73c9bf8ad7975e388093866fa2b13f93568 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5e674dea3133a174f455b1b0673ee98332cd72f2 (diff) | |
| parent | e61d3ff3d131c2f28adee085557cd93853af5e72 (diff) | |
Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: e61d3ff3d1
* commit 'e61d3ff3d131c2f28adee085557cd93853af5e72':
Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.
Change-Id: Ia6f1c88bba68df6660d7e91e4bedebda22bcf5c5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions