OSDN Git Service

Merge changes Id4d040ea,I318fb1fc into mnc-dev
authorAdam Seaton <aseaton@google.com>
Tue, 23 May 2017 17:32:15 +0000 (17:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 17:32:15 +0000 (17:32 +0000)
am: a2603bd360

Change-Id: Ia22d1824913e82550dae44a799cb9da4c7344949

1  2 
core/version_defaults.mk

Simple merge