tree 24555f235a3c7df4bac8d7933c4a21d5c2a78d9a
parent 73b77b9e9fd341d345bff206af48c84304358303
parent 5dd5f2ff288862510dc21dfdf4467c88acfd4d52
author Filip Pavlis <pavlis@google.com> 1521487208 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1521487208 +0000

Merge changes I94584b2b,Ib9b50c26 into pi-preview1-androidx-dev

* changes:
  Rebuild top of tree using jetifier.
  Fix SL dejetification.