tree d0864b03061806ad1644801dac336f88037ba3ec
parent 4e3762ae1c3c3a287c4059e1d21141ce0a304ddf
parent ebc69cd19e3c4a40748410f6d509989e83829f1b
author Nancy Chen <nancychen@google.com> 1410928360 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410928360 +0000

am 05a2c7ef: Merge "Remove ability to enable/disable phoneaccounts (1/6)" into lmp-dev

* commit '05a2c7ef905777fdbc1129146df6f389e2e6980a':
  Remove ability to enable/disable phoneaccounts (1/6)