am a961c06b: Reconcile with ics-mr0-release
* commit 'a961c06b9c0718406a72d71125aa0bf45d3c8659': Fix NPE in advanced settings
This commit is contained in:
committed by
Android Git Automerger
commit
f2a6adee46