Christoph Studer 2a188d34e0 am d9ca58c6: am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev ...

* commit 'd9ca58c678082a62d62df92a4f0921aaef353894':
  NoMan: Add 3s timeout in matchesCallFilter()

2014-09-25 16:38:33 +00:00

..

java/com/android/server

am d9ca58c6: am 78205c2b: Merge "NoMan: Add 3s timeout in matchesCallFilter()" into lmp-dev

2014-09-25 16:38:33 +00:00

jni

Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev

2014-09-19 02:00:26 +00:00

Android.mk

…