tree c1232404956017227ffa8ae9b1ca0b1bfaa0ee79
parent ca2cb1841099c7206af93149d0326308e0d3f81a
parent 62796aac596f556a1871358bb8ce93af9d55c5a5
author Glenn Kasten <gkasten@google.com> 1348170344 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348170345 -0700

Merge "Expose android.media.AudioManager.getProperty()" into jb-mr1-dev