tree 5ae94d6e4186efcaf67e198d8813d1a180960ea6
parent 39d554b7aab31bd772ffa2a17fa4212b7fb60f7a
parent 00245ffce4d08fbb6aeaeba62b8a30ce234862fa
author Alex Klyubin <klyubin@google.com> 1447802078 +0000
committer android-build-merger <android-build-merger@google.com> 1447802078 +0000

Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e am: 5995579f5f
am: 00245ffce4

* commit '00245ffce4d08fbb6aeaeba62b8a30ce234862fa':
  Insert Android Keystore JCA Provider at the correct position.