| commit | 017dfd207f0ac8ff606f922889e10ee4cb9c99ff | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Sep 22 21:16:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 22 21:16:50 2015 +0000 |
| tree | 4af660acb1f3bfc9054913ee53c86378a0a420c9 | |
| parent | 03b46e87896e9f6c7662e20437cc140a8678d5c2 [diff] | |
| parent | 66e3431b5f9a99dbd2f44f6428d1a46ac889df4d [diff] |
am 66e3431b: (-s ours) am ddff6526: am 8c02f8c3: am 96139bea: am e8e3e726: am 57f44a27: (-s ours) 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 * commit '66e3431b5f9a99dbd2f44f6428d1a46ac889df4d':