Jeff Brown 681f745916 am 7d9a18ee: Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp ...

* commit '7d9a18eeb684e87da5a907c96d25da21918119b5':
  Remove edge slop handling from ScaleGestureDetector.

2012-06-12 12:41:11 -07:00

..

java

am 7d9a18ee: Merge "resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp" into jb-dev-plus-aosp

2012-06-12 12:41:11 -07:00

jni

am 3857681e: am a7e3a1e0: Merge "Include important native processes in watchdog stacks." into jb-dev

2012-06-11 10:44:52 -07:00

res

Import translations. DO NOT MERGE

2012-06-11 11:51:42 -07:00

tests

am d26f7139: Merge "resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp" into jb-dev-plus-aosp

2012-06-08 14:08:28 -07:00