OSDN Git Service

resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp
authorEric Laurent <elaurent@google.com>
Wed, 10 Dec 2014 18:42:08 +0000 (10:42 -0800)
committerEric Laurent <elaurent@google.com>
Wed, 10 Dec 2014 18:42:08 +0000 (10:42 -0800)
commit093789755e5549bd8676d268a6f69b1d6db5026b
treeab2c0f9ae33cfbc521489040fdbfc65bd18e205c
parent93c5cf6a6fc928dbfd4426b7bd0c7731bfac0ed2
parent5196dd04a09cf3779e7354b9808c875202c615b7
resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp

Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d
core/jni/android_media_AudioSystem.cpp