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:
a6eed85
1e74fdb
)
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
author
Antony Sargent
<asargent@google.com>
Wed, 26 Jul 2017 16:18:33 +0000
(16:18 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 26 Jul 2017 16:18:33 +0000
(16:18 +0000)
am:
1e74fdb684
-s ours
Change-Id: I489efc8ca8d93cd94ac71e2ea65f45e888a9a138
Trivial merge