Martijn Coenen ce1279686b Merge "Add host-based card emu feature to PackageManager."

2013-07-22 22:29:21 +00:00

..

java

Merge "Add host-based card emu feature to PackageManager."

2013-07-22 22:29:21 +00:00

jni

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

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

res

resolved conflicts for merge of 85b5e4c4 to master

2013-07-19 14:09:30 -07:00

tests

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

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