| commit | 86b381be69d19524b3204a767584331b32e66eeb | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Tue Sep 25 02:33:46 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 25 02:33:46 2018 -0700 |
| tree | bed6ce53f6b1debb88137bf179b80181a3df499e | |
| parent | c070f7588be4c2a663a5b66592b655c3c817a54f [diff] | |
| parent | 8879ee4a78bec7c12fbfc1a1074a0951197117b6 [diff] |
Merge "Inline two short methods from Conscrypt" am: 9da9b33cc2 am: 91d61ea0ed am: 8879ee4a78 Change-Id: Iffbb91414c16b055fc3358e83fb5c23ef4998816