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:
f3e0e13
6e8fef2
)
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop...
author
Xin Li
<delphij@google.com>
Mon, 14 Nov 2016 13:39:25 +0000
(13:39 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 14 Nov 2016 13:39:25 +0000
(13:39 +0000)
am:
6e8fef24d9
Change-Id: I43f556df4700c9470a0df500eadddcbcd8146cf7
Trivial merge