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:
530c6db
86c72f7
)
resolve merge conflicts of 86c72f7ea5 to oc-dev-plus-aosp
author
Robin Lee
<rgl@google.com>
Wed, 29 Mar 2017 12:54:02 +0000
(13:54 +0100)
committer
Robin Lee
<rgl@google.com>
Wed, 29 Mar 2017 12:54:02 +0000
(13:54 +0100)
Test: make RunSettingsRoboTests -j
Change-Id: If6b87d1caa358335ce56201eab0ed8add8b339e9
1
2
src/com/android/settings/datausage/AppDataUsage.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/com/android/settings/datausage/AppDataUsage.java
Simple merge
OSDN Git Service
