| commit | 8879ee4a78bec7c12fbfc1a1074a0951197117b6 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Tue Sep 25 02:20:26 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 25 02:20:26 2018 -0700 |
| tree | 09def46c9b4651c0473d331505575b65b5627bb4 | |
| parent | 2abeaddf262459e5ab25afe939d8eb28c9c3e68b [diff] | |
| parent | 91d61ea0ed6edb3ff7d0017af120d19c6b75ba36 [diff] |
Merge "Inline two short methods from Conscrypt" am: 9da9b33cc2 am: 91d61ea0ed Change-Id: I541ff04bd67780e8920d802a7935c97e0adb535b