tree 5392c7d3ad3e5329810f397ab9c46cb46d418d9c
parent 50db3ad437e20730d60c2da4eee83e04444e1c0b
parent b81db8a3add2ceb31350223ebcdca2e60845cd10
author Rajeev Kumar <rajekumar@google.com> 1498151992 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498151993 +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