OSDN Git Service

resolved conflicts for 964f06b1 to stage-aosp-master
authorYing Wang <wangying@google.com>
Thu, 24 Sep 2015 02:31:44 +0000 (19:31 -0700)
committerYing Wang <wangying@google.com>
Thu, 24 Sep 2015 02:31:44 +0000 (19:31 -0700)
commit2f9f1fb32f8e2320cbb515c82a3b471da4b6e848
tree4ffe1e833fa4990efb71383cbe2c66dbeb0878a0
parenta0af56f6989d250f290257967f64f640531472f5
parent964f06b1782da73150d2f8953a41208898580061
resolved conflicts for 964f06b1 to stage-aosp-master

Change-Id: I0cebad2e440ec7d605afafac893352f06ca2f419
envsetup.sh