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:
5ad2fba
ee898c8
)
Merge "Fix broken test due to API rename" am: 0abc93177f
author
nharold
<nharold@google.com>
Thu, 14 Dec 2017 23:28:16 +0000
(23:28 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 14 Dec 2017 23:28:16 +0000
(23:28 +0000)
am:
ee898c81a7
Change-Id: I7e99991cd2c71c66e1acb3aa3957efb28c9a426a
Trivial merge