OSDN Git Service

Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am...
authorTyler Gunn <tgunn@google.com>
Wed, 8 Feb 2017 22:05:45 +0000 (22:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Feb 2017 22:05:45 +0000 (22:05 +0000)
commit58d8c5eb07a603ef2435c23228a0641fe03438ad
treefe4ea4b72378f43a97501f0f37a851ead5c71293
parentb9f9e6461940e20bce49f4f64a1def1d66fffa78
parent998655f80edab71fbe5748c60ce1b791ed92cef1
Merge "Change prototype for "setCamera" in IMS VideoProvider." am: c164b159f8 am: e55b11573e
am: 998655f80e

Change-Id: I01c5d8c15ce9377f126fc7268bd1a8ecee602dc8