summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-09-02 20:06:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-02 20:06:52 +0000
commitcfb252cdb748429789f918c4268fcca1331f6cec (patch)
tree4404a07cd9bdb54e200ba87a18166313871d7a17 /services/camera
parentdcdfe1a176a29ba03698473c1e77c953fbda2cb5 (diff)
parent7665f5886093e1aee07a5266b8c384e5d1186f34 (diff)
downloadframeworks_av-cfb252cdb748429789f918c4268fcca1331f6cec.zip
frameworks_av-cfb252cdb748429789f918c4268fcca1331f6cec.tar.gz
frameworks_av-cfb252cdb748429789f918c4268fcca1331f6cec.tar.bz2
Merge "nuplayer: let non-offload AudioSink to handle the reconnect when there's video." into mnc-dr-dev
Diffstat (limited to 'services/camera')
0 files changed, 0 insertions, 0 deletions