OSDN Git Service

resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Wed, 16 May 2012 20:18:39 +0000 (13:18 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Wed, 16 May 2012 20:18:39 +0000 (13:18 -0700)
commitfeec98b139d2ca0b0164a5e178e75ce88b8f492f
tree5f3fabe21a06e92d94f179c4bed05de7d937b949
parentf760bcbae298d63a53c710cf8857de6174857e25
parent62855a83b86c0b40583888f93d8b054c7d8ac99c
resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp

Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07
core/combo/TARGET_linux-x86.mk
core/dumpvar.mk
core/llvm_config.mk
envsetup.sh