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