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:
b9b62ed
8887059
)
Merge "DO NOT MERGE: Fix ApfTest" am: 05f0bfe33e -s ours
author
Hugo Benichi
<hugobenichi@google.com>
Mon, 4 Sep 2017 04:14:38 +0000
(
04:14
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 4 Sep 2017 04:14:38 +0000
(
04:14
+0000)
am:
8887059b00
-s ours
Change-Id: I4d5fe729d56096f0aad725ff74e55d8db347f1f2
Trivial merge