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:
972734f
b278424
)
Merge "Revive DeadZone" into oc-dev
author
Siarhei Vishniakou
<svv@google.com>
Mon, 19 Jun 2017 23:59:46 +0000
(23:59 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 19 Jun 2017 23:59:46 +0000
(23:59 +0000)
am:
b278424fa6
Change-Id: I5a06302eaad1e955aaea6ae8d2785c0b12e53cc4
1
2
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
patch
|
diff1
|
diff2
|
blob
|
history
tests/testables/src/android/testing/BaseFragmentTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
Simple merge
diff --cc
tests/testables/src/android/testing/BaseFragmentTest.java
Simple merge