tree f85361dc5a6f553de6cd8ab246d1af8461118a26
parent 9114a845d9474bc2ecc807c3f195fe0c5314556c
parent bbdc1c0e044a505d5a200963319a683e4ef1f967
author Junda Liu <junda@google.com> 1415750718 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415750720 +0000

Merge "Add HIDE_CARRIER_NETWORK_SETTINGS global setting." into lmp-mr1-dev