tree cce87a2771bd05bdf6418245dbdb670fcf4fbc6f
parent 52e929a9613e52e199dcf12b95acab31be3c25bd
parent 26bc6907b93a21adcdf8ffdc24d7d96482be8165
author Andres Morales <anmorales@google.com> 1413325234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413325234 +0000

am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit '26bc6907b93a21adcdf8ffdc24d7d96482be8165':
  Set layout_width in WiFi+NFC resource