Dianne Hackborn 04cca35b85 resolved conflicts for merge of cc585f86 to master ...

Change-Id: I72aa7707edeb48f63fbe5348915a31650bdfd8f5

2013-09-20 19:04:45 -07:00

..

common_time

…

input

Propagate input ANR reason to activity manager log.

2013-09-10 16:44:24 -07:00

java

resolved conflicts for merge of cc585f86 to master

2013-09-20 19:04:45 -07:00

jni

Ensure access to the map of geofence callbacks is synchronized in all cases

2013-09-20 15:19:00 -07:00

tests/servicestests

Pending op fix didn't merge properly from KLP-dev.

2013-09-16 15:23:41 -07:00