diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:16:54 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2012-11-06 12:16:54 -0800 |
commit | 86ee26bf99d8937d6dfd3aaee7965368e1612a62 (patch) | |
tree | a9efd9fd08b548ef3027b00973d8440316ae5931 /media/libstagefright/StagefrightMediaScanner.cpp | |
parent | f1da23d362ed32f295118c6bfd67b820eb94b1ce (diff) | |
parent | 92c24ec09efb505513fc188026bddb70c273eddf (diff) | |
parent | c2d98f3376f1ce8178e7c2ba6dd20dbbcfcdb73f (diff) | |
download | frameworks_av-86ee26bf99d8937d6dfd3aaee7965368e1612a62.zip frameworks_av-86ee26bf99d8937d6dfd3aaee7965368e1612a62.tar.gz frameworks_av-86ee26bf99d8937d6dfd3aaee7965368e1612a62.tar.bz2 |
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Idf4c25115d89397ba668fc290344b2e7c1ea1993