| commit | 5be5c5bc30f6108ee52a79a288331c4f187d5e89 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Sep 16 22:43:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:43:48 2015 +0000 |
| tree | 670502c95ec27994624f6f3ffeaec42a6993e195 | |
| parent | 4afc710efbf00ae861149c837a6c9f464082df8d [diff] | |
| parent | 0a6fc7c9629bf3cdcff560acc0eb9e2371b31ca3 [diff] |
am 0a6fc7c9: am 90013bcf: am 0a74c306: am f90847d9: am 4b25e16a: (-s ours) am 2fe211ed: am 38689fc0: am 5df7c06e: (-s ours) 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 aut * commit '0a6fc7c9629bf3cdcff560acc0eb9e2371b31ca3':