| commit | 95ce44327b2105270c08f036f16a4a6fdd0fae87 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Oct 14 01:11:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 01:11:16 2015 +0000 |
| tree | 3d2c8a1ad83466c2ed5fc4fa5b11c2f110dc1c0f | |
| parent | 018add7e3312be1828dbf062e4e5c45cf59b7ad1 [diff] | |
| parent | ddefbc168fb090163334931c57f770f75edb8b12 [diff] |
am ddefbc16: (-s ours) am 8ac15a8d: am 2440aa9f: DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch * commit 'ddefbc168fb090163334931c57f770f75edb8b12': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch