| commit | 8229b21d1ab209a5c5f5865563ad13aeb5a73282 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 22 18:13:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 18:13:42 2015 +0000 |
| tree | 0c08cc8d4bfcdd7cd832aed7ef6cc559ada86a5a | |
| parent | d73116ba2260c6c53f697f941ca32bffe68513a4 [diff] | |
| parent | b7da0b8c2f3f23ffa16ac5abfb79e57ce7b21d0f [diff] |
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 lollipop-cts-dev * commit 'b7da0b8c2f3f23ffa16ac5abfb79e57ce7b21d0f': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch