tree d789df67e1c8e861c18317662da2077a32b156ed
parent 8185411f3600f0707396ee46ab0429e97319cfae
parent 1392f5b80d6ee58515747f42332d1139aeef4dbd
author Raman Tenneti <rtenneti@google.com> 1564007666 -0700
committer android-build-merger <android-build-merger@google.com> 1564007666 -0700

Merge "Gallery2: Fix jni build warnings" am: a5627ca40f am: ad599cd1c5
am: 1392f5b80d

Change-Id: I4b65b7f8e5ce5737b797815178811b2c3668ba07