Adam Cohen 16f36e8215 am c9ca7f38: Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev ...

* commit 'c9ca7f38bccfa56bbca44998758869ec8c71f4d3':
  Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)

2012-05-01 15:38:35 -07:00

..

java

am c9ca7f38: Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev

2012-05-01 15:38:35 -07:00

jni

Merge "Surface: add JNI plumbing for setActiveRect." into jb-dev

2012-04-30 17:13:45 -07:00

res

Merge "Import translations. DO NOT MERGE" into jb-dev

2012-05-01 13:42:13 -07:00

tests

am 63d944d6: am 93a8225e: Merge "Improve robustness of resource overlay test suite."

2012-05-01 10:09:21 -07:00