tree 824ff07e992cbf8c2cfab6612031925f684c3ccc
parent f872d42837c64d82260e40f64be592ee9a233a95
parent eb8202c363675022aeaf04ea9bdec868f491abd2
author Nicholas Sauer <nicksauer@google.com> 1440524620 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440524620 +0000

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