tree 91b58a5add83056315b1262ec58261c679d66029
parent 3844067c3c6cca954250a734d8bd8dad673bb846
parent 43b6fd9a54743b617bde184d2dda04ca1ea5204e
author Matthew Xie <mattx@google.com> 1334692080 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1334692080 -0700

Merge "Check nullpointer of discoverableTimeout in initBluetoothAfterTurningOn."