| commit | 0eaf78ca9d39d32c93634a904cae4037bee6ac22 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Wed Sep 17 08:19:50 2014 -0700 |
| committer | Wink Saville <wink@google.com> | Wed Sep 17 08:19:50 2014 -0700 |
| tree | e7d65a9486e820641279149acd4992f1898c7652 | |
| parent | 87c9e217216ae28598f6a708568029ec18e15d83 [diff] | |
| parent | 1bc64db0931e12d90e8c262f442e73bacf06ad0a [diff] |
Merge commit '1bc64db0' into fix-conflict * commit '1bc64db0': Remove ability to enable/disable phoneaccounts (2/6) Conflicts: AndroidManifest.xml Change-Id: I2668c4c0ab8a35ea69b7e01949274e407d346f28