| commit | 5df7c06e7a9e9c11116acb02acc8153c2c140c93 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:24:19 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 25 17:24:19 2015 +0000 |
| tree | c4609f83aed3112adb8783ea6c0ea8630fd890f1 | |
| parent | b7a630fc0d7989dfc4416bc2c9a594809fff8756 [diff] | |
| parent | 350853a3392ba8c4f0480fc6b9a488e3175df2ff [diff] |
Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 -s ours automerge: af857be -s ours automerge: 350853a -s ours * commit '350853a3392ba8c4f0480fc6b9a488e3175df2ff': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch