Craig Mautner ff288f7f57 resolved conflicts for merge of b7bba718 to master ...

Change-Id: Ibbac3f6e3eda0149ae9446d6baed1d1bee5138ac

2013-12-19 10:55:17 -08:00

..

java

resolved conflicts for merge of b7bba718 to master

2013-12-19 10:55:17 -08:00

jni

am 67fa194e: am ee767548: am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper"

2013-12-19 07:58:25 +00:00

res

Import translations. DO NOT MERGE

2013-12-18 16:01:23 -08:00

tests

am 263c4788: am 30253d7a: am 2daa0c93: Merge "Add address flags and scope to LinkAddress."

2013-12-09 18:34:44 +00:00