| commit | 2e6395d9b550d0395d988f8c1b5e37e7f1bc230b | [log] [tgz] |
|---|---|---|
| author | Nancy Chen <nancychen@google.com> | Wed Sep 17 04:50:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 17 04:50:20 2014 +0000 |
| tree | 8cf4639f99985bbf5722d6b49d113fa8a320143a | |
| parent | 44fe960f73f7ff164063c299d0acf1a9a8453ec4 [diff] | |
| parent | 455e5906624d4cfd329772ec1cfe355d17ae671c [diff] |
am 455e5906: am 258276dc: resolved conflicts for merge of 0a0744d3 to lmp-ub-dev * commit '455e5906624d4cfd329772ec1cfe355d17ae671c': Remove ability to enable/disable phoneaccounts (2/6)