summaryrefslogtreecommitdiffstats
path: root/core/java/android/view
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-10-21 21:39:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-21 21:39:30 +0000
commitaec33e66acbcf83a58b0e7af14c6330f48063bf8 (patch)
tree5a924be5f4ff498e6e1b29a52efdbabd573dd49c /core/java/android/view
parent0a76c47e7134a10d9aa61d27e7b9f99569ed20da (diff)
parentcd90d42d9d6e56c8180fd621f0c9afda297291d5 (diff)
downloadframeworks_base-aec33e66acbcf83a58b0e7af14c6330f48063bf8.zip
frameworks_base-aec33e66acbcf83a58b0e7af14c6330f48063bf8.tar.gz
frameworks_base-aec33e66acbcf83a58b0e7af14c6330f48063bf8.tar.bz2
am cd90d42d: am 017c6f2d: Merge "Fire onConferenceChanged after reseting conference." into lmp-mr1-dev
* commit 'cd90d42d9d6e56c8180fd621f0c9afda297291d5': Fire onConferenceChanged after reseting conference.
Diffstat (limited to 'core/java/android/view')
0 files changed, 0 insertions, 0 deletions