Benjamin Franz 9c0e993d4e am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev ...

* commit 'f4a76651b0fec69242822e57441b1a937fb6daf3':
  Change the routing path of bluetooth headset connections.

2014-12-09 00:17:44 +00:00

..

java

am f4a76651: am 5f1ea2e6: am fb967585: Merge "Change the routing path of bluetooth headset connections." into lmp-mr1-dev

2014-12-09 00:17:44 +00:00

jni

resolved conflicts for merge of 203c8171 to master

2014-12-04 16:06:34 -08:00

res

am 5f5e13d0: am 108e5394: am 6dfa60f3: Avoid extra saveLayer calls in RippleDrawable, fix docs

2014-12-09 00:16:54 +00:00

tests

Merge "Allow compilation with Jack."

2014-12-04 09:26:54 +00:00