Romain Guy d1233575b5 Merge "Use the parameter type as part of the methods cache key"

2013-07-23 00:03:51 +00:00

..

java

Merge "Use the parameter type as part of the methods cache key"

2013-07-23 00:03:51 +00:00

jni

Merge "camera2 api: marshal rect, size, string for metadata"

2013-07-22 21:38:55 +00:00

res

Merge "First shot at (host-based) card emulation APIs."

2013-07-22 23:20:01 +00:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00