tree 9fa12b7ba0d6db6bec07dc662803c1133b0d60f4
parent 3bce5d4a172f1b7e7612a64f22075867b9b85b73
author Daniel Xie <dxie@google.com> 1446597970 +0000
committer Daniel Xie <dxie@google.com> 1446597970 +0000

Revert "Revert "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch""

This reverts commit 3bce5d4a172f1b7e7612a64f22075867b9b85b73.

Change-Id: I06519a5bbd0a45bbc9c1a21855f59172f9bb0817