OSDN Git Service

Merge "Add SoundTriggerManager APIs to use a PendingIntent to get callbacks." into...
authorChris Thornton <thorntonc@google.com>
Wed, 14 Jun 2017 19:16:36 +0000 (19:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Jun 2017 19:16:36 +0000 (19:16 +0000)
am: 6f071c369e

Change-Id: I98f9c06856a70a5a4b3634f41860068c331f0c83


Trivial merge