summaryrefslogtreecommitdiffstats
path: root/test-runner/src
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2014-10-30 23:44:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-30 23:44:03 +0000
commit2a369533947c5552ba8e1c5cc9fb657952e3f0e0 (patch)
tree1d0d1016eaf557f006958a1ab6c05550560b7d00 /test-runner/src
parentbfc8599f43971fc11a7d1e67e557a83b3d476609 (diff)
parent7577f3dd8b738d73253f0c6bfe2383ef71a9ba20 (diff)
downloadframeworks_base-2a369533947c5552ba8e1c5cc9fb657952e3f0e0.zip
frameworks_base-2a369533947c5552ba8e1c5cc9fb657952e3f0e0.tar.gz
frameworks_base-2a369533947c5552ba8e1c5cc9fb657952e3f0e0.tar.bz2
am 7577f3dd: am 16723098: Merge "Communicating participant changes to conference controller." into lmp-mr1-dev
* commit '7577f3dd8b738d73253f0c6bfe2383ef71a9ba20': Communicating participant changes to conference controller.
Diffstat (limited to 'test-runner/src')
0 files changed, 0 insertions, 0 deletions