tree 9fedc42e171b42fadc3e0eba498ca4fd23ba347f
parent 1781dcc1c849ea1582ab233801a64cb2fe1098a7
parent 436b7b5634500690c34cee310247624dfd007006
author Jeff Sharkey <jsharkey@android.com> 1538416143 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1538416143 +0000

Merge changes from topic "bugfix_content_path"

* changes:
  Add OEM_SOUNDS_DIR variable
  Fix the bug that secondary storage path is judged as internal
  Revert "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content"