| commit | 1d55b68e757be69e8d09aeed7d88d01da1feca86 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:35:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 17:35:10 2015 +0000 |
| tree | b278ccfd6210457e494540e833283b3b7f9d885d | |
| parent | 9ee55252a4ddea2d6d789a59c4ed2069f6220e88 [diff] | |
| parent | 86f2ec1a03053d89e3341ae8ccc22754e504f005 [diff] |
am 86f2ec1a: (-s ours) 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 automerge: 9e7c72c * commit '86f2ec1a03053d89e3341ae8ccc22754e504f005': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch