summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2014-09-24 21:28:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-24 21:28:43 +0000
commitd9cb5a7344c1a04a52445a410a875b79d4c38a62 (patch)
tree6351f9c89e03603ec39f250d896fd1fec7f866c0 /core/java/android
parentfae2aabc30b0c3143fe3096140f8f4a9b00d87a7 (diff)
parentccc7cb9bdb3eb5f86d81e223b82e04dab21ad5fa (diff)
downloadframeworks_base-d9cb5a7344c1a04a52445a410a875b79d4c38a62.zip
frameworks_base-d9cb5a7344c1a04a52445a410a875b79d4c38a62.tar.gz
frameworks_base-d9cb5a7344c1a04a52445a410a875b79d4c38a62.tar.bz2
Merge "Return masked location mode for managed profiles" into lmp-dev
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions