OSDN Git Service

Merge "Separate system_version and product_version." am: b7b92040c2 am: 17c7b6045a
authorSen Jiang <senj@google.com>
Wed, 8 Mar 2017 05:11:19 +0000 (05:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 05:11:19 +0000 (05:11 +0000)
am: 7efd883330

Change-Id: I69ec2cc2e601db942b830f56c8c33851c0337916


Trivial merge