OSDN Git Service

Merge "[AWARE] Update API per review"
authorEtan Cohen <etancohen@google.com>
Mon, 21 Nov 2016 21:50:34 +0000 (21:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 21 Nov 2016 21:50:34 +0000 (21:50 +0000)
am: 9e4f111e0f

Change-Id: I69001477d02c612540ff74385400551293f7c600


Trivial merge