tree 3c1f5e897e1311aa657b01c6c1bf13372264d343
parent e011342ac8d79aa7a9b7e21da30f076e55946015
parent 5fcbe91533dcd16501770b41a8c6a7cef869a0ce
author Jean-Michel Trivi <jmtrivi@google.com> 1409935307 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409935307 +0000

Merge "Add MODIFY_PHONE_STATE permission for changing the audio mode" into lmp-dev