tree e4664d155dc33235ea6721a10629d5992421e18b
parent 910a4c60ab5d5c1056e2047cfed0c22c53826126
parent 360e25280c1a119e2a204545c70bcf8018fb961c
author Nathan Harold <nharold@google.com> 1547491103 -0800
committer android-build-merger <android-build-merger@google.com> 1547491103 -0800

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

Change-Id: I6d9fa8b2f640abca0708a84ed76e450f7f5f9e72