tree 2ab875a0615a4c48379c3bf3fa208f1ce0100497
parent 79a2d2a936c735adc33d570de4330f1852e69d5d
parent 3fe1ae29cd19362b25dfffa5c0f48d9559e18f3e
author Jeff Sharkey <jsharkey@android.com> 1509750423 +0000
committer android-build-merger <android-build-merger@google.com> 1509750423 +0000

Merge "Define NOT_ROAMING network capability." am: 8f380ab29c
am: 3fe1ae29cd

Change-Id: Ib511f7af82c80fd4e95f4da9de1fdce200deb987