tree 75a81163e89f09c092a7719e8a1757f214034a83
parent 088bf6b8966d9c58714c7cc2a9d107a9a5c0f348
parent 9f9372bcc14238c5700bebce09d4eddf6193c7cb
author Stephen Hines <srhines@google.com> 1532043966 -0700
committer android-build-merger <android-build-merger@google.com> 1532043966 -0700

Merge "Remove "template" keyword from non-templated calls."
am: 9f9372bcc1

Change-Id: I0048ea15b8cb949261902a198091fb674ef30d8c