| commit | 413f951d8195b7bee207698d5092fde78b118fd9 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 01 21:12:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 21:12:55 2015 +0000 |
| tree | 987574a480911572297417d281c1f86193d3973f | |
| parent | 1c78e38a207ae0aed3314173cfa26c8f548b8cc2 [diff] | |
| parent | e5de9542940c98118bae4f60da79c1d735e46360 [diff] |
am e5de9542: (-s ours) am 9b0ac51e: am e05affb3: am 55cd1889: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into lollipop-mr1-cts-dev * commit 'e5de9542940c98118bae4f60da79c1d735e46360': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch