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:
9f43133
c01cf7b
)
am c01cf7b9: resolved conflicts for merge of 2b8d2383 to gingerbread
author
Ying Wang
<wangying@google.com>
Tue, 15 Jun 2010 22:17:42 +0000
(15:17 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 15 Jun 2010 22:17:42 +0000
(15:17 -0700)
Merge commit '
c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6
' into gingerbread-plus-aosp
* commit '
c01cf7b9e6bda3f7e15aeda9cff03b6b41c5cba6
':
Add a tapas command.
Rename is_unbundled_app_build and UNBUNDLED_APP_BUILD to TARGET_BUILD_APPS.
Trivial merge