Zhihai Xu 8bd9e0cdc1 am 03a896b6: am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev ...

* commit '03a896b6d8971e54a72e90d9373d162f6a4d8f40':
  ISSUE 6849488 Bluedroid stack, remove system/bluetooth.

2012-09-20 20:27:42 -07:00

..

java

am 820c12c1: am 58e7f73c: Merge "Multiuser awareness in content observer infrastructure" into jb-mr1-dev

2012-09-20 20:27:35 -07:00

jni

am 03a896b6: am 77f6677b: Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev

2012-09-20 20:27:42 -07:00

res

Import translations. DO NOT MERGE

2012-09-20 15:54:25 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00