OSDN Git Service

resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am...
authorZach Jang <zachjang@google.com>
Wed, 22 Jun 2016 01:46:17 +0000 (01:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:46:17 +0000 (01:46 +0000)
commita36f36dcc013c5c38024922df6661f8dede5d396
treee80cae1ced4bce3999fca40b5d26dcfc5c30b676
parent49e12eab7117cbaadd9eac457d67240f99d42057
parent1f87a820ad227befc84f6a2a11fa73333f8deb5f
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb am: e7bc1542db am: 1be6c69524
am: 1f87a820ad

Change-Id: If484b9ee55f16b85cead3587d08c757ae8df6d2b