| commit | 943b139b4c9d7876a7103ed8ac001303df3d226a | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:43:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 17:43:40 2015 +0000 |
| tree | 824ff07e992cbf8c2cfab6612031925f684c3ccc | |
| parent | f872d42837c64d82260e40f64be592ee9a233a95 [diff] | |
| parent | eb8202c363675022aeaf04ea9bdec868f491abd2 [diff] |
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_patch" into jb-dev * commit 'eb8202c363675022aeaf04ea9bdec868f491abd2': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch