| commit | 86f2ec1a03053d89e3341ae8ccc22754e504f005 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:30:07 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 25 17:30:07 2015 +0000 |
| tree | eb10caa33ab152455bd50620239849ec196adfa0 | |
| parent | 6d6cf8e27d10c44ea42d52d536da1e4d74d3b404 [diff] | |
| parent | 9e7c72c0e0d6f4f6d3c36a2c522f7f0b7c83854c [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 automerge: 9e7c72c * commit '9e7c72c0e0d6f4f6d3c36a2c522f7f0b7c83854c': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch