Yorke Lee 99bd4eabd1 Merge "Add manage voicemail permission (1/4)"

2014-07-09 14:50:26 +00:00

..

java

Restrict factory reset with user restrictions.

2014-07-09 11:52:42 -04:00

jni

am ce75618e: am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]"

2014-07-09 15:07:35 +00:00

res

Merge "Add manage voicemail permission (1/4)"

2014-07-09 14:50:26 +00:00

tests

Merge "Initial work for key rotation."

2014-07-02 18:22:50 +00:00