OSDN Git Service

am d0d76e56: am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing...
authorLucky Zhang <luckyzh@google.com>
Fri, 21 Nov 2014 23:13:37 +0000 (23:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Nov 2014 23:13:37 +0000 (23:13 +0000)
commit72c70cb0985e5bc9ca12cdb99940862ae8d42685
tree6fb0489260543c25f4c601be8e9194a6e8717ecc
parenta78fbb48ce6f7ee51a06181274524680e40f1c00
parentd0d76e56af9c75b75d8f08c2ba77577e2745a382
am d0d76e56: am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev

* commit 'd0d76e56af9c75b75d8f08c2ba77577e2745a382':
  [SetupWizard] Warn user of missing FRP if skipping wi-fi
res/values/strings.xml