| commit | 4273e8b0871b537ba2c476e743adf302e5f7c78d | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 18:03:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 18:03:34 2015 +0000 |
| tree | d52a9c15e0df0ac4b492376f0f3c1019dfdbdfd0 | |
| parent | 1dc225cd46ef6c10177ad7bc3bf9651c2f441bc6 [diff] | |
| parent | aff3058bbd07363bb7ff257e84a614d72db80b7d [diff] |
am aff3058b: am 943b139b: am eb8202c3: (-s ours) am 0560e4f7: am 72abc959: (-s ours) am 62a4b871: am b035585c: am b0309151: am 97ac7946: am fc0ffd49: am e85b1c69: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_p * commit 'aff3058bbd07363bb7ff257e84a614d72db80b7d': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch