Glenn Kasten 5bae9df4e8 Merge "Replace run-time PCM encodings by compile-time constants"

2013-07-23 17:32:10 +00:00

..

java

Merge "User restriction API to disable single-user restrictions feature."

2013-07-23 16:21:48 +00:00

jni

Merge "Replace run-time PCM encodings by compile-time constants"

2013-07-23 17:32:10 +00:00

res

Merge "Import translations. DO NOT MERGE"

2013-07-23 15:39:46 +00:00

tests

am b8292830: resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp

2013-06-28 16:53:27 -07:00