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:
75faf02
3518221
)
Merge "Add additional mocking for Context innards" am: a65aa77c1c
author
Erik Kline
<ek@google.com>
Wed, 7 Jun 2017 09:46:11 +0000
(09:46 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 7 Jun 2017 09:46:11 +0000
(09:46 +0000)
am:
35182218d3
Change-Id: I7f08086badfddcf9d667a749cf035e36366f9a7c
Trivial merge