OSDN Git Service

am 0d4a8ce2: am d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi...
authorAndres Morales <anmorales@google.com>
Wed, 15 Oct 2014 02:08:45 +0000 (02:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 15 Oct 2014 02:08:45 +0000 (02:08 +0000)
commitb6f8177251fbbcec752f1de81ee760eae8f3fcef
tree4227adbefcdcb00b693de0efdc2a96a99c3a0153
parent74e79a96804c4a6309e61f2675170ea4562fe9a7
parent0d4a8ce26e40de04f90614c0a44124d9ef156026
am 0d4a8ce2: am d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit '0d4a8ce26e40de04f90614c0a44124d9ef156026':
  Set layout_width in WiFi+NFC resource