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:
7e4f8a2
9e639df
)
Merge changes Ifa91ad93,I14f9696a into pi-dev am: d067cbcfc9
author
Lei Yu
<jackqdyulei@google.com>
Thu, 10 May 2018 02:25:25 +0000
(19:25 -0700)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 10 May 2018 02:25:25 +0000
(19:25 -0700)
am:
9e639df738
Change-Id: Ic156328bb3249d9c82cc4ea38dc17bc39ddf0d27
1
2
src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
Simple merge
diff --cc
src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicy.java
Simple merge
diff --cc
src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
Simple merge