OSDN Git Service

am 31af905a: am 36db9d08: Merge "Further work on issue #7307399: Framework needs...
authorDianne Hackborn <hackbod@google.com>
Wed, 10 Oct 2012 02:14:24 +0000 (19:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 10 Oct 2012 02:14:24 +0000 (19:14 -0700)
commit572286b4152245a73ac00ebc69b4bd8fc4bc586d
tree62ec9d6f0f2d9c62ffea03376c9a057c136aedb9
parentb096f6f5d0ed31bc0d510696d133fc8a3ee772b8
parent31af905ac5388339fd0ffd87e6f25bd2a293dc0e
am 31af905a: am 36db9d08: Merge "Further work on issue #7307399: Framework needs a new pre-user-shutdown..." into jb-mr1-dev

* commit '31af905ac5388339fd0ffd87e6f25bd2a293dc0e':
  Further work on issue #7307399: Framework needs a new pre-user-shutdown...