Fyodor Kupolov 47ed3195f9 Merge "Allow alternative policy description for secondary users"

2015-02-25 20:17:21 +00:00

..

java

Merge "Allow alternative policy description for secondary users"

2015-02-25 20:17:21 +00:00

jni

am f7b68049: am 533758c1: am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags"

2015-02-25 19:26:57 +00:00

res

Merge "Allow alternative policy description for secondary users"

2015-02-25 20:17:21 +00:00

tests

Normalize deprecated 2-letter language code when necessary.

2015-02-21 02:26:40 +09:00