tree 6ca5024a73ebcf8a1b279f5c5c16118da9e1398b
parent b84915c63ec8e642ab69e88a28a6a30486371228
parent 57623fe8a44014682277d2d298e3caef478bd5ed
author Cassie Han <xih@google.com> 1520106591 +0000
committer android-build-merger <android-build-merger@google.com> 1520106591 +0000

Merge "Add the string/dimen/style values for the new Auto-select network UI" am: 2eb07c0a4c am: 8e32666f13
am: 57623fe8a4

Change-Id: I05a534efbedc146a8df0d0fb6dca873803fc6450