OSDN Git Service

am 815b329a: am 7d1737e0: Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 17:12:05 +0000 (17:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Nov 2011 17:12:05 +0000 (17:12 +0000)
commitb3482364097141ed795057f9c60c8e54b87c9b03
tree72bcd88e9c49a6e56b086013906d44019f4905d6
parent1ed27d9420c5a08642a32ac01906993dbb06e0ba
parent815b329af8704e58008860318429f2c70ec547f0
am 815b329a: am 7d1737e0: Reconcile with ics-factoryrom-2-release

* commit '815b329af8704e58008860318429f2c70ec547f0':
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"