tree 98446b5614912a8fe92123807d095c4ff3450ace
parent 179e858b78c389885b0d9406eb1d810e7b91980d
parent 7e1fb09d0b8e94f55509c65aca797c467c810f89
author Przemyslaw Szczepaniak <pszczepaniak@google.com> 1448272638 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1448272638 +0000

Merge changes from topic 'merge-enso-to-master'

* changes:
  API update for OpenJdk based libcore
  Switch RecoverySystem impl to use sun.security.pkcs
  Use libcore/known_oj_tags for the javadoc stage.