OSDN Git Service

Merge branch 'aosp/honeycomb-LTE-release' into honeycomb-mr2-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 22 Nov 2011 07:01:36 +0000 (15:01 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 22 Nov 2011 07:01:36 +0000 (15:01 +0800)
commitd5a41d0d74104eef92651b0406e86b54afc718fe
treebd0000712bc95e5faa7092b42096c55330aca17b
parente51446829362f6967bcdcb024c6e3df86f0a65d9
parent372e22998f598ec70cbd4744c601f01c00453e4e
Merge branch 'aosp/honeycomb-LTE-release' into honeycomb-mr2-x86

Conflicts:
core/build_id.mk
core/Makefile
core/main.mk
target/board/generic_x86/device.mk
target/product/generic_x86.mk