tree fbd328d8d7eda21ed678dd93b011864fd20a9e29
parent a465f8907f27c4602b8918e6e3977109b0ea5cee
parent 26fa24bf4f0051a012cd1bf7c6f82344d9c26805
author chen xu <fionaxu@google.com> 1551833030 -0800
committer android-build-merger <android-build-merger@google.com> 1551833030 -0800

Merge "add missing annotation for CarrierIdentifier" am: fd46a0aaeb
am: 26fa24bf4f

Change-Id: I3f19f615f5a042c4e041430fc94f3b3d918e6388