summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-27 17:01:49 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-27 17:01:49 -0700
commitd21e7b5d542cc9e93526182272c2bdc995c816fb (patch)
tree01fcaa424a2f1f91827a3f58a58f4d03856ffa76 /include/media
parentca96ed1d0eb83831649788ddc5b7a802afc2a30a (diff)
parentc4791bd65cdf2e487c87da0d863140337e5141cb (diff)
downloadframeworks_base-d21e7b5d542cc9e93526182272c2bdc995c816fb.zip
frameworks_base-d21e7b5d542cc9e93526182272c2bdc995c816fb.tar.gz
frameworks_base-d21e7b5d542cc9e93526182272c2bdc995c816fb.tar.bz2
am c4791bd6: Merge commit \'5e3562a5\' into m
* commit 'c4791bd65cdf2e487c87da0d863140337e5141cb': onDetachedFromWindow is called before onAttachedToWindow
Diffstat (limited to 'include/media')
0 files changed, 0 insertions, 0 deletions