tree fe2b3bba97a694a5f665174e46b564100b1457ef
parent f92a431d495a7b480c8e3bf593379c0ea9bf46c8
parent d69cc64d4474c4fd8e8f1845e7aa3951647e3f44
author Nancy Chen <nancychen@google.com> 1410929071 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410929071 +0000

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

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