summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/Surface.java
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-10-21 23:33:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-10-21 23:33:50 +0000
commit013ccb64302e18d4b6461351448a1fd6b9a7c53d (patch)
treef102fe3769f6d0412ebe1d752bcde54cd806d687 /core/java/android/view/Surface.java
parente0da8accd020c861a2f1d12a153e4c0b9707e631 (diff)
parentaec33e66acbcf83a58b0e7af14c6330f48063bf8 (diff)
downloadframeworks_base-013ccb64302e18d4b6461351448a1fd6b9a7c53d.zip
frameworks_base-013ccb64302e18d4b6461351448a1fd6b9a7c53d.tar.gz
frameworks_base-013ccb64302e18d4b6461351448a1fd6b9a7c53d.tar.bz2
am cd90d42d: am 017c6f2d: Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev
automerge: aec33e6 * commit 'aec33e66acbcf83a58b0e7af14c6330f48063bf8': Fire onConferenceChanged after reseting conference.
Diffstat (limited to 'core/java/android/view/Surface.java')
0 files changed, 0 insertions, 0 deletions