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:
5eca35d
13b17b2
)
Merge "AOD: When prox covered disable touch during pulse instead of aborting" into...
author
Adrian Roos
<roosa@google.com>
Mon, 31 Jul 2017 12:42:13 +0000
(12:42 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 31 Jul 2017 12:42:13 +0000
(12:42 +0000)
am:
13b17b2990
Change-Id: Ib7e303b11b47096daf7216cd6dbd109a047733f9
Trivial merge