Martijn Coenen c197019054 Merge "Add an API to manually invoke Android Beam."

2014-02-25 18:43:37 +00:00

..

java

Merge "Add an API to manually invoke Android Beam."

2014-02-25 18:43:37 +00:00

jni

am cc99b18c: am a6f70d8b: am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer"

2014-02-25 13:20:52 +00:00

res

Merge "Import translations. DO NOT MERGE"

2014-02-25 17:16:07 +00:00

tests

am 94b7c749: am 37e6af75: am 92a09fbd: am a14d9c31: Merge "Move Json{Reader,Writer} test to cts."

2014-02-17 18:32:44 +00:00