OSDN Git Service

Merge "Temporary disable new round implementation on x86/x86_64" am: 9526d13c79
authorAart Bik <ajcbik@google.com>
Thu, 4 Aug 2016 23:29:28 +0000 (23:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 4 Aug 2016 23:29:28 +0000 (23:29 +0000)
am: 2877582808

Change-Id: I978a8f05ad0b9c8b077dbe5be5af1d8b1cf7d102


Trivial merge