summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-22 01:49:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-22 01:49:44 +0000
commit9a59d411cbe68d6027c541854c6d7c1348e4ee3d (patch)
treed1dba2688eb058cf42c1bf23f100ed7653a7e78a /media
parentad71caf25e31ecfc4ecf2c925e38fd87905fbc8e (diff)
parent85e6e87c41bba51729cee8958a5c30157c8dc674 (diff)
downloadframeworks_av-9a59d411cbe68d6027c541854c6d7c1348e4ee3d.zip
frameworks_av-9a59d411cbe68d6027c541854c6d7c1348e4ee3d.tar.gz
frameworks_av-9a59d411cbe68d6027c541854c6d7c1348e4ee3d.tar.bz2
am 85e6e87c: Merge "Restore accidentally-removed NULL timeout."
* commit '85e6e87c41bba51729cee8958a5c30157c8dc674': Restore accidentally-removed NULL timeout.
Diffstat (limited to 'media')
0 files changed, 0 insertions, 0 deletions