Leon Scroggins 95f7b135ce Merge "Frameworks changes to support latest Skia (r14729)"

2014-05-15 14:40:45 +00:00

..

java

am 35b884f8: am be3dc575: am 402120a2: Merge "Wait for secondary zygote before bringing up the system_server."

2014-05-15 13:44:46 +00:00

jni

Frameworks changes to support latest Skia (r14729)

2014-05-15 10:17:44 -04:00

res

Merge "Import translations. DO NOT MERGE"

2014-05-15 14:26:00 +00:00

tests

Merge "Test multidex and annotations access."

2014-05-15 09:14:47 +00:00