| commit | b0309151e61ff3da569bfc5bf993bab97efe93e0 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 16:48:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 16:48:58 2015 +0000 |
| tree | 7c283188abe9fe3bc8a797d85ddfe369e142c7a3 | |
| parent | 29de7b189ab7c99485382f01a2c74f50328bd959 [diff] | |
| parent | 97ac79462b9850a2710c97bb59aab2598863c4d9 [diff] |
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 '97ac79462b9850a2710c97bb59aab2598863c4d9': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch