commit | ae104eb6c6073a3da25bb59f0d1b92165fe20e72 | [log] [tgz] |
---|---|---|
author | Jean-Michel Trivi <jmtrivi@google.com> | Fri Sep 05 23:46:00 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 05 23:46:00 2014 +0000 |
tree | 3ce457ab919d17aa45b2f41db562d69435fd3d21 | |
parent | d560851911a361bf44313f9c086755c04d43d0ca [diff] | |
parent | 2caa0a6070657a7985e11dc1c9f3174ff93d3f81 [diff] |
am 1c01afc0: Merge "AudioAttributes: unhide CREATOR" into lmp-dev * commit '1c01afc06ed47fbd983bc8e7c52851d0518021d7': AudioAttributes: unhide CREATOR