commit | 62a4b871a1d58ce958d788d1c93abf1c94bdc815 | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:00:07 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 17:00:07 2015 +0000 |
tree | 0205d9d90362ad18b1a41c22e8fe97fd0051aeba | |
parent | cbbfd900357ca52276df9d98b1ac25cdc593f278 [diff] | |
parent | b035585cbe8f049681cc94cdf71184eb0cfbee68 [diff] |
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 'b035585cbe8f049681cc94cdf71184eb0cfbee68': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch