tree 75b10f078e7a2ad11da80b73aafd1915dadd9c8e
parent c54a18d1422ae948de1a2504f6b7b9590911291d
parent 3f0ba8ac683e99ab8e38c594c782717689eca7b1
author Daniel Huang <danielwbhuang@google.com> 1552373405 -0700
committer android-build-merger <android-build-merger@google.com> 1552373405 -0700

[automerger skipped] Merge "Modify API return type and add callback." am: f96cc08066 am: 9b82062164
am: 3f0ba8ac68 -s ours
am skip reason: change_id I32fe1407deabe36485227ec75931bec334d85abe with SHA1 1f2850c472 is in history

Change-Id: Ie8b4894d48f1562ed647881a4da15dbc7136c872