Marco Nelissen 69b4670730 am ce3bd309: Merge "Parse UUID string with Long.parseLong" ...

* commit 'ce3bd309b12e9552c05d5a59a06d7883618c5ca0':
  Parse UUID string with Long.parseLong

2013-12-11 10:14:56 -08:00

..

java

am ce3bd309: Merge "Parse UUID string with Long.parseLong"

2013-12-11 10:14:56 -08:00

jni

Merge "Reimplement ZipFileRO in terms of libziparchive."

2013-12-11 11:41:10 +00:00

res

Import translations. DO NOT MERGE

2013-11-21 10:42:03 -08:00

tests

Merge "Add address flags and scope to LinkAddress."

2013-12-07 02:43:04 +00:00