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