| commit | 0560e4f73ad8860dc6de4f9c963a92454f236e9e | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:22:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 17:22:39 2015 +0000 |
| tree | b461ec577f9f66d6ef56f2ede1ccbbb3fed329d8 | |
| parent | 1ca6c54c80dffc3ee0e7e154ca3614d65caaa785 [diff] | |
| parent | 72abc95928cb4910ca45a7d803750c113b5e5972 [diff] |
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 '72abc95928cb4910ca45a7d803750c113b5e5972': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch