OSDN Git Service

resolve merge conflicts of e04c941 to stage-aosp-master
authorBenoit Lamarche <benoitlamarche@google.com>
Tue, 6 Dec 2016 10:32:41 +0000 (11:32 +0100)
committerBenoit Lamarche <benoitlamarche@google.com>
Tue, 6 Dec 2016 10:32:41 +0000 (11:32 +0100)
commit0e61b46673ac3e01492132060b1fab35a73e57d5
tree2beb52b5eb89baee7f83d129db7b1c177aba93f2
parent0deb783a52795faf67bb29f7967d9552d282d016
parente04c941668ccef612e22c66a323c2ce8995beaba
resolve merge conflicts of e04c941 to stage-aosp-master

Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
core/version_defaults.mk