summaryrefslogtreecommitdiffstats
path: root/core/jni/android_view_Surface.cpp
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-10-21 21:12:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-21 21:12:36 +0000
commitcd90d42d9d6e56c8180fd621f0c9afda297291d5 (patch)
tree2ba87cb2a35f48d16d740dd4e4735c66d105831c /core/jni/android_view_Surface.cpp
parent0dfda02ec30ee155fd26af0a5d390c504807e0eb (diff)
parent017c6f2daaed2c5f0301587ba88663f73b76ecb1 (diff)
downloadframeworks_base-cd90d42d9d6e56c8180fd621f0c9afda297291d5.zip
frameworks_base-cd90d42d9d6e56c8180fd621f0c9afda297291d5.tar.gz
frameworks_base-cd90d42d9d6e56c8180fd621f0c9afda297291d5.tar.bz2
am 017c6f2d: Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev
* commit '017c6f2daaed2c5f0301587ba88663f73b76ecb1': Fire onConferenceChanged after reseting conference.
Diffstat (limited to 'core/jni/android_view_Surface.cpp')
0 files changed, 0 insertions, 0 deletions