am f2d270a9: am 39a57cc2: (-s ours) am ad938797: Merge "Revert "Frameworks/base: Unused parameters in hwui"" * commit 'f2d270a9': Revert "Frameworks/base: Unused parameters in hwui"