| commit | a88d2264e8defdd8c6acec95f4d0923d38c95efe | [log] [tgz] |
|---|---|---|
| author | Sander Alewijnse <salewijnse@google.com> | Tue Nov 25 18:45:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 18:45:32 2014 +0000 |
| tree | 23a62283d09c0eb79857447141673b03f5101f13 | |
| parent | 6f6098e2b19e387178132e3acd07a25f173eb793 [diff] | |
| parent | 5b771a7ad92a2c39693821f68e668aacf30fdd97 [diff] |
am 5b771a7a: am b2eec50e: am 790f5269: am 991667d6: DO NOT MERGE Do NOT delete com.android.server.telecom for Device Owners. * commit '5b771a7ad92a2c39693821f68e668aacf30fdd97': DO NOT MERGE Do NOT delete com.android.server.telecom for Device Owners.