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:
b36a9e0
6fd057c
)
Merge "[AWARE] Fix unit tests" into oc-dev
author
Etan Cohen
<etancohen@google.com>
Wed, 29 Mar 2017 17:39:04 +0000
(17:39 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 29 Mar 2017 17:39:04 +0000
(17:39 +0000)
am:
6fd057cf58
-s ours
Change-Id: I01ae199e6cc506fbc358bac796c0d59fb47e9998
Trivial merge