| commit | 4b25e16a89d312a2dee02773be73253da6a1ddaf | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Thu Sep 10 18:26:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 10 18:26:09 2015 +0000 |
| tree | 3a25c739cf93ac4e56cdb2e28929637ea5d1e81d | |
| parent | e7a26fd20ad8d0aa3e623697a3507e2b211dac01 [diff] | |
| parent | 2fe211ede1a594398d49511a3d4f921fc2bcedff [diff] |
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 automerge: af857be -s ours automerge: 350853a -s ours * commit '2fe211ede1a594398d49511a3d4f921fc2bcedff':