Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev-plus-aosp (1a0bc037) · Commits · Android-smartphones / realme / realme 5pro / kaderbava / evolution_frameworks_base

Commit 1a0bc037 authored Jun 07, 2016 by Xin Li Committed by android-build-merger Jun 07, 2016

Merge "resolve merge conflicts of b9d266ff to nyc-dev-plus-aosp" into nyc-dev-plus-aosp

am: e61d3ff3

* commit 'e61d3ff3':
  Fixes the system server crash issues caused by null pointer in NetworkPolicyManagerService.

Change-Id: Ia6f1c88bba68df6660d7e91e4bedebda22bcf5c5

parents 5e674dea e61d3ff3

Hide whitespace changes

Inline Side-by-side

Please register or to comment