| commit | 8b8da04480a77042e54d7d483e9196d287bcd63e | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Sep 22 20:01:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 20:01:47 2015 +0000 |
| tree | f743879f8d921f434e35c5bf285e8ad91d4f0f5e | |
| parent | 3df162c49e4141f06692252fb354b1f815bdf011 [diff] | |
| parent | d73116ba2260c6c53f697f941ca32bffe68513a4 [diff] |
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 ours automerge * commit 'd73116ba2260c6c53f697f941ca32bffe68513a4':