Elliott Hughes b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp ...

Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6

2013-06-28 16:50:13 -07:00

..

common_time

Add liblog

2013-04-09 21:54:12 -07:00

input

resolved conflicts for merge of 7573e594 to stage-aosp-master

2013-05-28 15:43:16 -07:00

java

resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:50:13 -07:00

jni

Fix logspam when battery sysfs file not available.

2013-06-12 15:57:38 -07:00

tests/servicestests

Avoid logging sensitive data.

2013-06-07 15:09:32 -07:00