OSDN Git Service

resolve merge conflicts of e04c941 to stage-aosp-master
authorBenoit Lamarche <benoitlamarche@google.com>
Tue, 6 Dec 2016 11:11:58 +0000 (11:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 6 Dec 2016 11:11:58 +0000 (11:11 +0000)
commitdd80dde8d22b5a4d4adba8f4692b8980eec91a7f
tree36eea1acb348bc85ab20d9374eb488a3996a5438
parent54eac255b9fb5d87b15d65f2727b85db11bd21b9
parent0e61b46673ac3e01492132060b1fab35a73e57d5
resolve merge conflicts of e04c941 to stage-aosp-master
am: 0e61b46673

Change-Id: I988764ab18ddd8ae3219c0c4c73b4b92e7e83abb
core/version_defaults.mk