Olawale Ogunwale a230a43204 am 486a9942: Merge "[ActivityManager] Use synchronized to protect object" ...

automerge: e3b07b4

* commit 'e3b07b4856d55f7d96dcb25e3749c7cce1a1cd3d':
  [ActivityManager] Use synchronized to protect object

2014-12-17 21:50:31 +00:00

..

java

am 486a9942: Merge "[ActivityManager] Use synchronized to protect object"

2014-12-17 21:50:31 +00:00

jni

am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java."

2014-12-17 19:42:08 +00:00

res

Import translations. DO NOT MERGE

2014-12-17 07:39:09 -08:00

tests

am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions intact." into lmp-mr1-dev

2014-12-01 20:00:32 +00:00