| commit | 572286b4152245a73ac00ebc69b4bd8fc4bc586d | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Oct 09 19:14:24 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 09 19:14:24 2012 -0700 |
| tree | 62ec9d6f0f2d9c62ffea03376c9a057c136aedb9 | |
| parent | b096f6f5d0ed31bc0d510696d133fc8a3ee772b8 [diff] | |
| parent | 31af905ac5388339fd0ffd87e6f25bd2a293dc0e [diff] |
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...