OSDN Git Service

Merge changes I0fef0584,I322b91fa
authorJean-Michel Trivi <jmtrivi@google.com>
Thu, 19 Jun 2014 15:33:55 +0000 (15:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 18 Jun 2014 18:28:24 +0000 (18:28 +0000)
commit29a8b2fe294a34ac7f004203426961a599e725ea
tree06769995a441946136147a03e26817167e92bf88
parent7a4d7d6670f1766442b54045fb420dbf42b75750
parent5bd3f38638acab633d181359cc9ec27b80f84d43
Merge changes I0fef0584,I322b91fa

* changes:
  AudioPolicyManager: return output for audio attributes
  AudioTrack construction with audio attributes