tree 9ab83110de0c08c00b5302c0ab4eeb0fd0231e27
parent 1ba6b5a076659a6aea48a2cf3df0f106fdff5887
parent 95451d53907ca8befe2ae362947643cf983a0497
author Torbjorn Eklund <torbjorn.eklund@sonymobile.com> 1485807783 +0000
committer android-build-merger <android-build-merger@google.com> 1485807783 +0000

Merge "SFR sims should treat Spain as roaming" am: 06aed6950d am: e5f8e6088e am: 2cf376459b
am: 95451d5390

Change-Id: If9f4462435fd2adb81ad7b166f512550c6497e52