Amith Yamasani 86f0a242b9 am cc4d4562: am bc1ec524: am 57924e40: am de208628: am eb5fb023: Merge "Return masked location mode for managed profiles" into lmp-dev ...

* commit 'cc4d4562b88f4467b76b8598c1f4e51a2e3d1266':
  Return masked location mode for managed profiles

2014-09-24 23:03:22 +00:00

..

res

Import translations. DO NOT MERGE

2014-09-20 23:16:23 -07:00

src/com/android/providers/settings

Return masked location mode for managed profiles

2014-09-24 12:11:04 -07:00

Android.mk

Some system apps are more system than others

2013-06-17 12:47:35 -07:00

AndroidManifest.xml

Marking the Settings ContentProvider as singleUser

2014-08-22 12:12:29 +01:00

MODULE_LICENSE_APACHE2

…

NOTICE

…