tree dd9163639d052472f5e423f5fbdc717965a55efb
parent dacd2b01291acc67e83e87e336472b966bf92b2c
parent 8029ea41c8851c527ed5829e8c26fbf939661f34
author Glenn Kasten <gkasten@google.com> 1361480235 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1361480236 +0000

Merge "Permit conditional registry of mediaserver extensions"