OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE SMP: Validate remote elliptic curve points...
authorAndre Eisenbach <eisenbach@google.com>
Mon, 16 Apr 2018 17:03:43 +0000 (10:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 Apr 2018 17:03:43 +0000 (10:03 -0700)
am: 0cefb24d42  -s ours

Change-Id: Ie94b8a293a25e5cea84845fd68ca6df4962ab04c


Trivial merge