Jeff Brown ace7404de8 resolved conflicts for merge of d7337fb9 to master ...

Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0

2012-12-11 15:21:02 -08:00

..

java

resolved conflicts for merge of d7337fb9 to master

2012-12-11 15:21:02 -08:00

jni

am c0ffba90: am 261bc704: Merge "convert jint to uint32_t."

2012-12-10 10:34:20 -08:00

res

am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev

2012-12-11 14:19:41 -08:00

tests

Move Observer test to servicetests

2012-12-11 11:15:25 -08:00