tree b278cf0a9e9c89af24f3b2ab51837ad3bbfaf41e
parent 5341f94a191ae57b138f97cd516842bcf04c0609
parent 8aacb2e96c62887d5418851396f903b6cc4bb5ab
author Jean-Michel Trivi <jmtrivi@google.com> 1409960203 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409960204 +0000

Merge "AudioAttributes: unhide CREATOR" into lmp-dev