tree cb8b886d6f4ae0c63d91d29be01d4d242a1808d4
parent 90e6bbed41cba7b284e738be8871390a4766e026
parent 0d52bca39e23af789217869fc19fa719b063475f
author Rajeev Kumar <rajekumar@google.com> 1498152425 +0000
committer android-build-merger <android-build-merger@google.com> 1498152425 +0000

Merge "1. Replace use of java.util.HashMap with android.util.ArrayMap in FolderPagedView class 2. Get rid of explicit type arguments that can be inferred" into ub-launcher3-dorval-polish
am: 0d52bca39e

Change-Id: Ib1afd48f8c35e0f33d80c1f8b8b595348d23ce8a