| commit | d73116ba2260c6c53f697f941ca32bffe68513a4 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Sep 22 18:13:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 18:13:40 2015 +0000 |
| tree | 0c08cc8d4bfcdd7cd832aed7ef6cc559ada86a5a | |
| parent | 880d1d1cbe042e15ee295f476629f0d44dc73f53 [diff] | |
| parent | a9f632eee65cb787f0010ce51ecc43b2f5053a96 [diff] |
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: 5df7c06 -s * commit 'a9f632eee65cb787f0010ce51ecc43b2f5053a96':