tree 7eb090f7efe5fa0652c6d8c2554c08b11ad308ca
parent 4e8cd7dca6ed5a8b50051674391d1bff5c10c5f8
parent 0dc62c6dd3dd103be6ff4055472cc20fa3596e65
author nharold <nharold@google.com> 1488404278 +0000
committer android-build-merger <android-build-merger@google.com> 1488404278 +0000

Merge changes from topic 'query-fplmn-sync'
am: 0dc62c6dd3

Change-Id: Ibc08427e8de920f7f95a6a530b45cfcf8402d203