| commit | 3b400f21531fd30bc955cb59225a8d57215b0755 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:39:37 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 17:39:37 2015 +0000 |
| tree | d38c3fc1af52f7f1720c079ffa2bf018a2f9d2b9 | |
| parent | da98561425288c15e516b15e8aa1406e1ee5d03f [diff] | |
| parent | 1d55b68e757be69e8d09aeed7d88d01da1feca86 [diff] |
am 1d55b68e: am 86f2ec1a: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev automerge: e85b1c6 -s ours automerge: af857be -s ours automerge: 350853a -s ours automerge: 5df7c06 -s ours automer * commit '1d55b68e757be69e8d09aeed7d88d01da1feca86': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch