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