Eric Fischer 966f26e75b Import translations. DO NOT MERGE ...

Change-Id: I4f9ab5611d594523b15cd15609bc76b4a0d54a87

2012-03-26 13:09:00 -07:00

..

java

Merge "Add an API to expose Next Protocol Negotiation (NPN)."

2012-03-26 10:14:44 -07:00

jni

frameworks/base: move Zip* from libandroidfw to libutils

2012-03-22 18:43:07 -07:00

res

Import translations. DO NOT MERGE

2012-03-26 13:09:00 -07:00

tests

Merge "Add an API to expose Next Protocol Negotiation (NPN)."

2012-03-26 10:14:44 -07:00