summaryrefslogtreecommitdiffstats
path: root/media/jni/android_media_ImageReader.cpp
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2014-12-10 20:36:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-10 20:36:22 +0000
commit16d73a752e9ee937c39be4ce2da5411cf1af0c5c (patch)
treebccac03cdc12bcc5dc435cc3dc6131616748bac3 /media/jni/android_media_ImageReader.cpp
parentf9d2cd9931f12f7cb3459a322e7d92079fcb184d (diff)
parentdf55bf45e8ebcf699b9b4574db9119809935c549 (diff)
downloadframeworks_base-16d73a752e9ee937c39be4ce2da5411cf1af0c5c.zip
frameworks_base-16d73a752e9ee937c39be4ce2da5411cf1af0c5c.tar.gz
frameworks_base-16d73a752e9ee937c39be4ce2da5411cf1af0c5c.tar.bz2
am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev
automerge: df55bf4 * commit 'df55bf45e8ebcf699b9b4574db9119809935c549': Only add successfully bound profile services to mProfileServices.
Diffstat (limited to 'media/jni/android_media_ImageReader.cpp')
0 files changed, 0 insertions, 0 deletions