Eric Laurent 116ad74808 am 2af42833: am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev ...

* commit '2af4283374015d2d44433e628259f94a53e111e9':
  Fix safe volume warning message flickering

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

..

java

am 2af42833: am 6730c3c6: Merge "Fix safe volume warning message flickering" into jb-mr1-dev

2012-09-20 20:27:46 -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