tree 10e4dfa428717a8d3b0824ec42c52a1b2803d16f
parent c3e7f875b41f78de26d07f6c8ab8fe78747886c0
parent 07fe63e5de3cbc36a213178faede137cf648170a
author Daniel Sandler <dsandler@android.com> 1502980360 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1502980360 +0000

Merge changes from topic "revert-injectors" into oc-mr1-dev

* changes:
  Revert "Add API to allow apps more control over instantiation"
  Revert "Add plugin to swap out recents"