tree af763c56537b7c649644836705807893c7167d94
parent ef9221ee721db7aaf3bd7c4c37e9ec27924cba0a
parent ed0c722aadaa07d23fb4acfe5bc840eb3cdb31f6
author Nathan Harold <nharold@google.com> 1547494224 -0800
committer android-build-merger <android-build-merger@google.com> 1547494224 -0800

Merge changes from topic "cellinfocallback-error" am: 360e25280c
am: ed0c722aad

Change-Id: I835826b8197bea1e87491a8c18fc938d64c20f8d