RoboErik 5b53148a4e Merge changes I1cbdff1d,I23906b4c ...

* changes:
  Handle headsethook voice launching
  Add 5s timeout to wakelock

2014-05-21 19:59:11 +00:00

..

media

Merge changes I1cbdff1d,I23906b4c

2014-05-21 19:59:11 +00:00

mtp

Make setServer() safe to call multiple times

2014-03-27 13:25:14 -07:00