tree 7869de95baaf3f38a31cc9267ba707702b80b0c1
parent 7bc0929905fa5964a6f9a5b0b059153dc8cdd69d
parent 712d5b3d582dfe8f7fb855ba98704c98e9441836
author Stuart Scott <stuartscott@google.com> 1422656665 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422656665 +0000

am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev

* commit '712d5b3d582dfe8f7fb855ba98704c98e9441836':
  [DS] Correct the access method for telephony system property