tree 944c63b1e9c9d8a9e2076b3e771dbc26b1a03656
parent a2b29d5f9bda8a0019f57a737d06a7a24814c3bc
parent 6b0803575d047d405caf98d92511a2974c3b2338
author Nancy Chen <nancychen@google.com> 1410925236 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410925236 +0000

am 6b080357: Merge "Remove ability to enable/disable phoneaccounts (4/6)" into lmp-dev

* commit '6b0803575d047d405caf98d92511a2974c3b2338':
  Remove ability to enable/disable phoneaccounts (4/6)