| commit | 2fe211ede1a594398d49511a3d4f921fc2bcedff | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Fri Sep 04 22:02:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 22:02:50 2015 +0000 |
| tree | ec66061b2dbc2b4ce1f4bcfd8852dbd274b5c60e | |
| parent | d57eb7c4c85a6c909d89d3ffd9577b15b415bcd7 [diff] | |
| parent | 38689fc075f8847624fd63deb62f6b0ade6797d3 [diff] |
am 38689fc0: am 5df7c06e: (-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 * commit '38689fc075f8847624fd63deb62f6b0ade6797d3':