tree 8fa1e29143975638e9defb3cd30b3d1acfadc74e
parent 774dfb7212c83d6ca5dfb81a1a13d40614bb39fb
parent 931ab9ddad587137eb1144086cc8d7dc54f5abaf
author Chen Xu <fionaxu@google.com> 1487039192 +0000
committer android-build-merger <android-build-merger@google.com> 1487039192 +0000

Merge "remove activation button from preferred NW setting" am: 956e8707df
am: 931ab9ddad

Change-Id: I29125d47627ccd3c7d6d7d524d8e2b6a0e1336ec