| commit | 0e1d7e8568940ef4e83ae76c1b476855ce913144 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 18:25:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 25 18:25:41 2015 +0000 |
| tree | b278ccfd6210457e494540e833283b3b7f9d885d | |
| parent | 1d55b68e757be69e8d09aeed7d88d01da1feca86 [diff] | |
| parent | 33dfc50708360488e32143ad3d4f53443a8c0119 [diff] |
am 33dfc507: am 37bc8c1d: am 4273e8b0: (-s ours) am aff3058b: am 943b139b: am eb8202c3: (-s ours) am 0560e4f7: am 72abc959: (-s ours) am 62a4b871: am b035585c: am b0309151: am 97ac7946: am fc0ffd49: am e85b1c69: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro. * commit '33dfc50708360488e32143ad3d4f53443a8c0119':