tree c4609f83aed3112adb8783ea6c0ea8630fd890f1
parent b7a630fc0d7989dfc4416bc2c9a594809fff8756
parent 350853a3392ba8c4f0480fc6b9a488e3175df2ff
author Nicholas Sauer <nicksauer@google.com> 1440523459 +0000
committer android-build-merger <android-build-merger@google.com> 1440523459 +0000

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

* commit '350853a3392ba8c4f0480fc6b9a488e3175df2ff':
  DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch