Merge "Replace RecyclerViews with PagedRecyclerViews in Settings" into pi-car-dev
am: d601729ead

Change-Id: I1f5210dedb21b46c2ad6871789471a34b7d71c36
tree: 2f2fdcc78af026d3f9a6b21f98baf5fe7d55f2d6
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg