| commit | b4bb70036f4cba4f46b110861386dbe5692bd056 | [log] [tgz] |
|---|---|---|
| author | Nicolas Prevot <nprevot@google.com> | Tue Aug 26 11:28:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 26 11:28:57 2014 +0000 |
| tree | 2936b63113c89ad4baebe2db47634ca5b8c56f5f | |
| parent | ce60c56450f67c958690b9007ae2cb094749a42c [diff] | |
| parent | f69cbcce629734d004e4c5faf31492d442c18525 [diff] |
am f69cbcce: am 8afdc474: Merge "Disabling the Bluetooth and Nfc share activities for a managed profile." into lmp-dev * commit 'f69cbcce629734d004e4c5faf31492d442c18525': Disabling the Bluetooth and Nfc share activities for a managed profile.