| commit | 9e7c72c0e0d6f4f6d3c36a2c522f7f0b7c83854c | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:27:06 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 25 17:27:06 2015 +0000 |
| tree | cbc32dc78ee8303165a56b4183c41b475732bbda | |
| parent | 6307e355cca49059bf200dd1bf18f7a6887d9e88 [diff] | |
| parent | 5df7c06e7a9e9c11116acb02acc8153c2c140c93 [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 automerge: 5df7c06 -s ours * commit '5df7c06e7a9e9c11116acb02acc8153c2c140c93': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch