tree 31ba110fda7c914edf9799bdbc2791f8e26283a6
parent 2e38507b70d49985c16c9bc07b1ad8fe7f71c899
parent 21fd47548be421750cdcaf8e0c357747e927198d
author Amit Mahajan <amitmahajan@google.com> 1444867172 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444867172 +0000

am 21fd4754: am a41ea5e9: am 8fb8c37c: am 7b28e6ec: Merge "Adding config to allow/disallow user to add APNs." into mnc-dr-dev

* commit '21fd47548be421750cdcaf8e0c357747e927198d':
  Adding config to allow/disallow user to add APNs.