OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2e6fde5
628cea4
)
Merge "Added config system navigation keys." into nyc-mr1-dev
author
Doris Ling
<dling@google.com>
Tue, 14 Jun 2016 22:35:18 +0000
(22:35 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 14 Jun 2016 22:35:19 +0000
(22:35 +0000)
1
2
core/java/android/provider/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/res/values/symbols.xml
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/policy/PhoneWindowManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/provider/Settings.java
Simple merge
diff --cc
core/res/res/values/symbols.xml
Simple merge
diff --cc
services/core/java/com/android/server/policy/PhoneWindowManager.java
Simple merge