OSDN Git Service

am 38dc420e: resolved conflicts for merge of fa21f9db to lmp-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Thu, 11 Sep 2014 17:26:01 +0000 (17:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Sep 2014 17:26:01 +0000 (17:26 +0000)
commit3ea8d03cddc4a3611da3b7c4bfd22cf72bfc040a
treeebe1293e14c823b7ef9630d91ac0e312967fa9f0
parent8bb33546c1a5daea8bbe8156dfaac94f7367a545
parent38dc420e19a77e22c49fb568561fb697a91143cd
am 38dc420e: resolved conflicts for merge of fa21f9db to lmp-dev-plus-aosp

* commit '38dc420e19a77e22c49fb568561fb697a91143cd':
  Remove the vbox target from the build system.