tree f9d72c983168533ca7291fa5b89faa7668a1cd60
parent 0d4ab958c11801f5453e999f930416c87c63d100
parent 476520f744a950fc27d6ac466c301a909d92481a
author Amit Mahajan <amitmahajan@google.com> 1417003348 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417003348 +0000

am 476520f7: am 3749541a: Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev

* commit '476520f744a950fc27d6ac466c301a909d92481a':
  Adding helper functions to retrieve settings that are stored per subId.