OSDN Git Service

resolved conflicts for merge of e016e80c to jb-mr1-dev-plus-aosp
authorYing Wang <wangying@google.com>
Wed, 19 Dec 2012 21:28:01 +0000 (13:28 -0800)
committerYing Wang <wangying@google.com>
Wed, 19 Dec 2012 21:28:01 +0000 (13:28 -0800)
commit92f5ec962e69bc0788b53c16a469ca48e64223e7
tree832134594150c2aec226ce25d43b4bbfa0082910
parent5df36312d3e51be2812092de850bf4927092ce89
parente016e80c5bd1536a8c0b72dfcb02f1fa19135292
resolved conflicts for merge of e016e80c to jb-mr1-dev-plus-aosp

Change-Id: I889b3aac68aec152d34d14431b854d7a8e6575a9
vm/Android.mk