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:
27c2b72
4972aa3
)
Merge "Protect instant apps from full apps" into oc-dev
author
Todd Kennedy
<toddke@google.com>
Mon, 5 Jun 2017 16:44:45 +0000
(16:44 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 5 Jun 2017 16:44:45 +0000
(16:44 +0000)
am:
4972aa30bf
-s ours
Change-Id: I8e42b3f3b54b86f1bc7b2d3dc29973d96b7eb3a5
Trivial merge