OSDN Git Service

resolved conflicts for merge of fa21f9db to lmp-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Wed, 10 Sep 2014 23:15:18 +0000 (16:15 -0700)
committerDan Albert <danalbert@google.com>
Wed, 10 Sep 2014 23:15:18 +0000 (16:15 -0700)
commit38dc420e19a77e22c49fb568561fb697a91143cd
tree065be27462f71e352d2836dcd9e6df0abc36b2c8
parentc0bdd15b10401b7bf2e1b5acf30e06e7f2d5800c
parentfa21f9db1cfcf35efd0566f8dd03785f6164a488
resolved conflicts for merge of fa21f9db to lmp-dev-plus-aosp

Change-Id: I8cd590e7e6f764d6651dcaacd4beb8c72a23164f
envsetup.sh
target/product/AndroidProducts.mk