Narayan Kamath b2235d5db7 am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." ...

* commit 'fca204a4b8771b800383c91465a48eb2cd8b3ba2':
  Fix several bad function definitions.

2014-03-07 19:41:27 +00:00

..

java

am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"

2014-03-07 19:41:24 +00:00

jni

am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions."

2014-03-07 19:41:27 +00:00

res

am 16c0b295: am bba3a694: Merge "Telephony API extension v2"

2014-03-07 02:30:08 +00:00

tests

Move Json{Reader,Writer} test to cts.

2014-02-17 17:51:43 +00:00