summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-05-28 21:25:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 21:25:44 -0700
commitb61e757ffbe1c5cc05ca039f548ea4ce3bcb070f (patch)
tree4df5728bd54cf65c15250c080b1d0214a4c65ac3 /core/java/android
parent09d85677c32b0c5c89bbeba4d4f08850d0b85a28 (diff)
parent466ceb463f44f72bdd73764e50dcb34c174a0cfe (diff)
downloadframeworks_base-b61e757ffbe1c5cc05ca039f548ea4ce3bcb070f.zip
frameworks_base-b61e757ffbe1c5cc05ca039f548ea4ce3bcb070f.tar.gz
frameworks_base-b61e757ffbe1c5cc05ca039f548ea4ce3bcb070f.tar.bz2
am 466ceb46: am aa4b2ee0: Merge "Ignore outstanding delayed shutdown on restart" into jb-mr2-dev
* commit '466ceb463f44f72bdd73764e50dcb34c174a0cfe': Ignore outstanding delayed shutdown on restart
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions