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:49:56 +0000 (01:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:49:56 +0000 (01:49 +0000)
commit248a5b2bf92792fb72ccaa3048d1b63c662feee7
tree5ab06711cfee790244621413f8d7da8b0da6e284
parent906013688e263a0acbe23f3a02c54f090ca51b30
parenta36f36dcc013c5c38024922df6661f8dede5d396
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
am: a36f36dcc0

Change-Id: If03ecbb95d14127d9534aecd20da984b2fd65d1c
core/version_defaults.mk