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:
3ed7d20
3e633ac
)
Merge \\\\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed...
author
Hall Liu
<hallliu@google.com>
Mon, 20 Jun 2016 21:49:28 +0000
(21:49 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 20 Jun 2016 21:49:28 +0000
(21:49 +0000)
am:
3e633acd70
-s ours
Change-Id: I100675dd3f20aafcf08599b7947a1ddd88c10d07
Trivial merge