tree 71e64246642a1437d5fa5781845b08db78a51b28
parent bbbb154c8986f5c731f159ec6d043945b896183b
parent c868b645b46685574955eaff9f8d46d9262a3357
author Christopher Tate <ctate@google.com> 1347497495 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347497496 -0700

Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev