OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6fdea52
0413efd
)
am 0413efd2: (-s ours) resolved conflicts for merge of 3bb81eb0 to klp-modular-dev...
author
Griff Hazen
<griff@google.com>
Wed, 21 May 2014 03:47:58 +0000
(
03:47
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 21 May 2014 03:47:58 +0000
(
03:47
+0000)
* commit '
0413efd261c9e6103ec65ff60af3ef22dfc80d19
':
Set API version for KKWT. DO NOT MERGE
Trivial merge