| commit | af821528292eeb53f077b5fd49682d21193c357d | [log] [tgz] |
|---|---|---|
| author | Sander Alewijnse <salewijnse@google.com> | Tue Nov 25 18:57:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 25 18:57:12 2014 +0000 |
| tree | 2e656dadd7dbd6589ef7a89f586e836a77a07094 | |
| parent | 7e6f985e9948c18269b11862864e0b9ab26e83ee [diff] | |
| parent | a88d2264e8defdd8c6acec95f4d0923d38c95efe [diff] |
am a88d2264: (-s ours) am 5b771a7a: am b2eec50e: am 790f5269: am 991667d6: DO NOT MERGE Do NOT delete com.android.server.telecom for Device Owners. * commit 'a88d2264e8defdd8c6acec95f4d0923d38c95efe': DO NOT MERGE Do NOT delete com.android.server.telecom for Device Owners.