tree a396788e13e49256578cde402410090789b9e922
parent 2fba776ee0227e54f750dc6b87c8ca1bc1fd556f
parent 5995579f5ff1511f4a089dd0537cd634fb615465
author Alex Klyubin <klyubin@google.com> 1447705896 +0000
committer android-build-merger <android-build-merger@google.com> 1447705896 +0000

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

* commit '5995579f5ff1511f4a089dd0537cd634fb615465':
  Insert Android Keystore JCA Provider at the correct position.