OSDN Git Service

am 6f3b20cc: Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 19:31:40 +0000 (11:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Nov 2012 19:31:40 +0000 (11:31 -0800)
commit3407c24dd95896706a51d816b085e4ed8df3443a
tree8294b32bd4f44d8be0a2ea8819c736634d0a6a12
parent1c37b8000999c98e8cb5fe76c1f52d204f901783
parent6f3b20ccc14c25173780f01c621dbb2279cd8236
am 6f3b20cc: Reconcile with jb-mr1-release - do not merge

* commit '6f3b20ccc14c25173780f01c621dbb2279cd8236':
  Revert "NumberPicker should adjust min and max when displayed values are set." (a.k.a. Santa is back)
  Notification vibration improvements: [DO NOT MERGE]