| commit | fae51dd6bc97ecf7d64a458b63761dc71f471511 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 21:16:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:16:56 2015 +0000 |
| tree | 4af660acb1f3bfc9054913ee53c86378a0a420c9 | |
| parent | 017dfd207f0ac8ff606f922889e10ee4cb9c99ff [diff] | |
| parent | 074b3bcbb12ed9c5d8cf7574685b6f2e52895905 [diff] |
am 074b3bcb: (-s ours) am 81633f50: am f2af7417: am ebdce8bd: am 12f72fcd: am ac3885ad: (-s ours) am bcc58bf4: am 8229b21d: am b7da0b8c: am 05447533: am 104f4316: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into * commit '074b3bcbb12ed9c5d8cf7574685b6f2e52895905': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch