tree 7738d0f99db96ed9c12f5e8ea11314e01667d943
parent 266fd264dbeb2c2667adf1f1ca41861b5b9f889a
parent 2e233d30662d26846a42c298967842d2e8537653
author Stuart Scott <stuartscott@google.com> 1422656787 +0000
committer android-build-merger <android-build-merger@google.com> 1422656787 +0000

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

* commit '2e233d30662d26846a42c298967842d2e8537653':
  [DS] Correct the access method for telephony system property