tree 7a09a4525f5028a1c1fe65da185cfb491241d7cd
parent 37ebb54c5459cc6021947a9a9bb370d4ffc3e965
parent ae4d8c9a731123ed3f03d50ef71cdedfb80fd6c0
author Andreas Gampe <agampe@google.com> 1520008933 +0000
committer android-build-merger <android-build-merger@google.com> 1520008933 +0000

Merge "Gallery2: Fix CollectionIncompatibleType" am: 7115c7cbf9
am: ae4d8c9a73

Change-Id: Ic752304dc8191bf42eba98a7f7f64fd12b13f22d