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:
231610f
2d0f47c
)
Merge "Add Configuration to APF Policy" am: d27a6d62c6 am: 70291ef1d7
author
Ahmed ElArabawy
<arabawy@google.com>
Thu, 20 Jul 2017 04:01:11 +0000
(
04:01
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 20 Jul 2017 04:01:11 +0000
(
04:01
+0000)
am:
2d0f47c40f
-s ours
Change-Id: I1a456d4a649001d7de04f9de3a2b2a76167b19cf
Trivial merge