Justin Koh be4c2c2b99 resolved conflicts for merge of d90712d0 to master ...

Change-Id: Ia587476c001bce5f0969557b15d366aed6b322b1

2014-04-22 11:05:15 -07:00

..

java

Merge "Do not disturb: persist user config."

2014-04-22 15:03:08 +00:00

jni

am 7d755a6f: Merge branch \'klp-modular-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp

2014-04-18 01:13:29 +00:00

res

resolved conflicts for merge of d90712d0 to master

2014-04-22 11:05:15 -07:00

tests

am 65bcc3ff: am 6c0454ec: Merge "add bt instrumentation to run as a util" into klp-modular-dev

2014-04-22 13:33:13 +00:00