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:
9cb91ef
cfd30c5
)
[automerger skipped] Merge "Make android.test.mock.stubs in Android.bp" am: 5f29cbb53b
author
Jiyong Park
<jiyong@google.com>
Fri, 13 Apr 2018 12:30:44 +0000
(
05:30
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 13 Apr 2018 12:30:44 +0000
(
05:30
-0700)
am:
cfd30c5f43
-s ours
Change-Id: If050bb11934319b44b7513ffcec0d6020edf5571
Trivial merge