summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-24 15:28:17 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2013-05-24 15:28:17 -0700
commitdd6b47e675a9601280ee1375fccee7c1ec01d9eb (patch)
tree779d2d32ae4371ef43ce3abc87097ca6fa75cec0 /media
parent22a5ddb68173b75053d838a30d091920cd0a1dca (diff)
parentb4a0680452c4049b6342ebbee5f33db232f9370a (diff)
downloadframeworks_av-dd6b47e675a9601280ee1375fccee7c1ec01d9eb.zip
frameworks_av-dd6b47e675a9601280ee1375fccee7c1ec01d9eb.tar.gz
frameworks_av-dd6b47e675a9601280ee1375fccee7c1ec01d9eb.tar.bz2
Reconcile with jb-mr2-release - do not merge
Change-Id: Icbc5d05e35b35baffce494c53fca9caf82658760
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions