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:
6bb9c54
d033285
)
Merge "Worked around back button navigation issue"
author
Lifu Tang
<lifu@google.com>
Thu, 9 Apr 2015 17:26:46 +0000
(17:26 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Thu, 9 Apr 2015 17:26:47 +0000
(17:26 +0000)
1
2
src/com/android/settings/SettingsActivity.java
patch
|
diff1
|
diff2
|
blob
|
history
src/com/android/settings/fuelgauge/PowerUsageDetail.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/SettingsActivity.java
Simple merge
diff --cc
src/com/android/settings/fuelgauge/PowerUsageDetail.java
Simple merge