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