summaryrefslogtreecommitdiffstats
path: root/res/values-mr-rIN
diff options
context:
space:
mode:
authorPaul Crowley <paulcrowley@google.com>2014-11-17 13:42:16 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-17 13:42:16 +0000
commitb674ebbca662957645e2d3bf61492bf4b392564f (patch)
treeabdf08184a996c822a57f5bbdcd6e2ef937f5265 /res/values-mr-rIN
parentc3dd561fc2524a62350d410e8dd0483ad216ea5e (diff)
parente722c375df0155c581cb3eb79f4fcc5f8891d738 (diff)
downloadpackages_apps_Settings-b674ebbca662957645e2d3bf61492bf4b392564f.zip
packages_apps_Settings-b674ebbca662957645e2d3bf61492bf4b392564f.tar.gz
packages_apps_Settings-b674ebbca662957645e2d3bf61492bf4b392564f.tar.bz2
am e722c375: am 807386b7: am bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-dev
* commit 'e722c375df0155c581cb3eb79f4fcc5f8891d738': Force power cycle on cooldown.
Diffstat (limited to 'res/values-mr-rIN')
0 files changed, 0 insertions, 0 deletions