| commit | 57f44a274ec9685ce8d689fd07e7ddc52e2beec2 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Sep 22 20:10:43 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:10:43 2015 +0000 |
| tree | cc23bb4af49f34d3df07d554d286b4c146912a90 | |
| parent | ed478294babbe05ea2ab8a6012c1b929b418793e [diff] | |
| parent | 8b8da04480a77042e54d7d483e9196d287bcd63e [diff] |
am 8b8da044: am d73116ba: am a9f632ee: am 40629641: am 9e7c72c0: (-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 o * commit '8b8da04480a77042e54d7d483e9196d287bcd63e':