tree 0b1953b36ccb18309c7e789af73d66faa0fdcad0
parent 4afaad887fe3e78f08731ce0df7a9a2e4d94c5f0
parent 17674b611582a6da3d10606283e638091b3e660d
author Torbjorn Eklund <torbjorn.eklund@sonymobile.com> 1485298938 +0000
committer android-build-merger <android-build-merger@google.com> 1485298938 +0000

Merge "Vodafone SIMs should treat Spain as roaming" am: a9c27b348c am: 8e9cf51db3 am: 3cd1f5bac7
am: 17674b6115

Change-Id: I12e3aa291057a30cdc64c5413e10f18d38b17148