tree a8b374844594f6f6e2d511a648b9f8304529297e
parent f2d838a52e60a75c6f22f0c88591b31f707ff000
parent 75a7a591ba91aeefdf3e43f1bfd62f579a5aac79
author Sen Jiang <senj@google.com> 1488943691 +0000
committer android-build-merger <android-build-merger@google.com> 1488943691 +0000

Merge "Put system_version in target_files.zip" am: 3838ae7e9b
am: 75a7a591ba

Change-Id: I24c3d03dd9c30ec67dc7f9231da392f811650b20