OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
aad82fa
05777a7
)
Merge "Hide wifi and bt in battery settings" into oc-dev
author
jackqdyulei
<jackqdyulei@google.com>
Tue, 20 Jun 2017 22:55:47 +0000
(22:55 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 20 Jun 2017 22:55:47 +0000
(22:55 +0000)
am:
05777a7918
Change-Id: If676ec0119bebed800727f618225fd355e9da74f
1
2
src/com/android/settings/fuelgauge/BatteryUtils.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/fuelgauge/BatteryUtils.java
Simple merge
diff --cc
tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
Simple merge