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:35:58 +0000 (01:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 01:35:58 +0000 (01:35 +0000)
commit3749025ccbbc0776fe10c5813262ed771e7185b6
tree228024b80ae82284e1f4f8aabc18a8945a6c6536
parente718501021dd039875745d3ff829341c2bb05248
parent9fc3cf7ba21d0877372f682a6a0c7db2a2294c1c
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94
am: 9fc3cf7ba2

Change-Id: Idcd5da62fd7c36da94af3a15f35d179e1a3940f2
core/version_defaults.mk