| commit | 37bc8c1dd630b3694582b2c81b61187f081fcc27 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 18:10:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 18:10:00 2015 +0000 |
| tree | f11adc1988bde0a6d676553726c9b3c15c93085e | |
| parent | 213b00597f12a17e31d19c80b05e9118f2652f18 [diff] | |
| parent | 4273e8b0871b537ba2c476e743adf302e5f7c78d [diff] |
am 4273e8b0: (-s ours) am aff3058b: am 943b139b: am eb8202c3: (-s ours) am 0560e4f7: 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.versi * commit '4273e8b0871b537ba2c476e743adf302e5f7c78d': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch