OSDN Git Service

am 7f8c3973: am 120a8847: Merge "AudioTrack: fix head position after restore" into...
authorEric Laurent <elaurent@google.com>
Wed, 16 Oct 2013 22:38:30 +0000 (15:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Oct 2013 22:38:30 +0000 (15:38 -0700)
* commit '7f8c397378a7ee5abd395413be71388ad36d3ed2':
  AudioTrack: fix head position after restore

1  2 
include/private/media/AudioTrackShared.h
media/libmedia/AudioTrack.cpp

Simple merge