summaryrefslogtreecommitdiffstats
path: root/services/devicepolicy
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2015-04-14 05:13:35 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-14 05:13:35 +0000
commit8cc578c37b3f8f4f97e96617fda6538852d71628 (patch)
treef433db5a44195466489c925c64e26e2d75a95f98 /services/devicepolicy
parent14c361e1b76548c83e8912b190ac79d96f34e50d (diff)
parent38544901e6aa6934b032303be314a92dcde662f3 (diff)
downloadframeworks_base-8cc578c37b3f8f4f97e96617fda6538852d71628.zip
frameworks_base-8cc578c37b3f8f4f97e96617fda6538852d71628.tar.gz
frameworks_base-8cc578c37b3f8f4f97e96617fda6538852d71628.tar.bz2
am 38544901: am f2a57c69: am cda895c5: am c578bff7: am a80fc040: am 00f857c5: Merge "Doc change: add new pages for Designed for Families." into lmp-docs
* commit '38544901e6aa6934b032303be314a92dcde662f3': Doc change: add new pages for Designed for Families.
Diffstat (limited to 'services/devicepolicy')
0 files changed, 0 insertions, 0 deletions