| commit | eb8202c363675022aeaf04ea9bdec868f491abd2 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:36:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 17:36:56 2015 +0000 |
| tree | 27005ddcc2809faaf581b2efaf193c3136844d16 | |
| parent | 740270dc5c412696ed899e1aae747cf6c0493806 [diff] | |
| parent | 0560e4f73ad8860dc6de4f9c963a92454f236e9e [diff] |
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 '0560e4f73ad8860dc6de4f9c963a92454f236e9e': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch