tree 1d9fac203a0ac9353d8a384770cb69541ffb6d31
parent d8dd05e7d610572d0850dd9edc538bf930aa7d51
parent 9afe3b1252c8600d9864494cbe225d1f3ac7b477
author Cassie <xih@google.com> 1512107477 +0000
committer android-build-merger <android-build-merger@google.com> 1512107477 +0000

Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc am: 3ba72e7130
am: 9afe3b1252

Change-Id: Ib1db63334919e6d8f605fb2b342265cd71348982