| commit | 91d61ea0ed6edb3ff7d0017af120d19c6b75ba36 | [log] [tgz] |
|---|---|---|
| author | Adam Vartanian <flooey@google.com> | Tue Sep 25 02:04:57 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Sep 25 02:04:57 2018 -0700 |
| tree | 2231c48717a3f80b182c5ac0f38777b4fedc4485 | |
| parent | a9fec7e73b4ecf6c8e657f52fa3c092c5f8a4ab6 [diff] | |
| parent | 9da9b33cc288830e75c8509c60346b253ad3a797 [diff] |
Merge "Inline two short methods from Conscrypt" am: 9da9b33cc2 Change-Id: I4c66064ec1a0569f7766282d6dbee5202906ae00