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:
d975003
00c553e
)
Merge "DO NOT MERGE - Added Emergency affordance feature" am: a0322d5c5a -s ours
author
Selim Cinek
<cinek@google.com>
Thu, 13 Oct 2016 14:18:41 +0000
(14:18 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 13 Oct 2016 14:18:41 +0000
(14:18 +0000)
am:
00c553e1ba
-s ours
Change-Id: I7e41e24257827c592a15ef446c95dd173a5b055c
Trivial merge