commit | 350853a3392ba8c4f0480fc6b9a488e3175df2ff | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 17:22:50 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 25 17:22:50 2015 +0000 |
tree | 30637638c3539ac1d406ef238d482b932c90dd24 | |
parent | 8236bcdd38e61bae96dfaf3bb2dce90fd08b2307 [diff] | |
parent | af857be53f762b7192dc33eb958a59fedf118e95 [diff] |
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 * commit 'af857be53f762b7192dc33eb958a59fedf118e95': DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch