| commit | 0008e752309bc3b42e977017bd702aeb3a80205d | [log] [tgz] |
|---|---|---|
| author | Jean-Michel Trivi <jmtrivi@google.com> | Thu Aug 28 22:38:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 28 22:38:56 2014 +0000 |
| tree | 1dc1ea426c1cc80e3b4c9d5d6956616bbc9e1321 | |
| parent | b1dd80a8c2b192119cb0c4c5534ab6aa9a3f23cf [diff] | |
| parent | 09daab204c4121138b77d43c3c56632474612a4d [diff] |
am 2d770004: Merge "android.media.Ringtone: add getter for AudioAttributes" into lmp-dev * commit '2d770004425f3a9c831b84f9b0b4308aa72f4478': android.media.Ringtone: add getter for AudioAttributes