summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-29 08:05:57 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2013-05-29 08:05:57 -0700
commit197d3e077384087a8674bbfcbecf63a88e611426 (patch)
tree2ff6050957f8eebf0d63cbd5cc904182d19f0946 /media
parent9f013a46e150da01ebb267574d8095eef399cd0c (diff)
parent8617908345eff421b629d82b32f79e44efbf8de3 (diff)
downloadframeworks_av-197d3e077384087a8674bbfcbecf63a88e611426.zip
frameworks_av-197d3e077384087a8674bbfcbecf63a88e611426.tar.gz
frameworks_av-197d3e077384087a8674bbfcbecf63a88e611426.tar.bz2
Reconcile with jb-mr2-release - do not merge
Change-Id: I55d8c1a91b9750864f82176768ea93bf11337726
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions