OSDN Git Service

(root) / android-x86 / packages-apps-Settings.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d89840 a4e854f)
am a4e854fa: Merge "Tweak battery usage to match red lines." into lmp-preview-dev
authorDianne Hackborn <hackbod@google.com>
Wed, 4 Jun 2014 18:08:33 +0000 (18:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 18:08:33 +0000 (18:08 +0000)
* commit 'a4e854fa5b9f5adc4898088f6d454dd92f4238a5':
  Tweak battery usage to match red lines.

1  2 
res/values/strings.xml patch | diff1 | diff2 | blob | history

diff --cc res/values/strings.xml
Simple merge
packages/apps/Settings
About OSDN
Find Software
Develop Software
Help