tree d0b2a859938827943e695a91833603f76c6358d6
parent f640cd318dfa1113d9f09582dbfdf44e612ed4a3
parent 355e52215f191334be43c6101066a1ef5225a872
author Etan Cohen <etancohen@google.com> 1479769654 +0000
committer android-build-merger <android-build-merger@google.com> 1479769654 +0000

Merge "[AWARE] Update API per review" am: 9e4f111e0f am: ce7f932be7 am: 86cd994a15
am: 355e52215f

Change-Id: I0f334e1db798bdfcadb4547d7edda5200e160b43