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:
5e92ece
9788dd5
)
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1...
author
Xin Li
<delphij@google.com>
Fri, 11 Nov 2016 00:00:49 +0000
(
00:00
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 11 Nov 2016 00:00:49 +0000
(
00:00
+0000)
am:
9788dd5bd2
Change-Id: I317b0be7182896e39fd23b152ff08ebf4de37592
Trivial merge