Merge "Merge "Emulator-ATV: Add SdkSetup provision app" into nyc-dev am: 38689a6fef...
authorBo Hu <bohu@google.com>
Thu, 28 Apr 2016 22:45:04 +0000 (22:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Apr 2016 22:45:04 +0000 (22:45 +0000)
commitffdc1e307c299740d923a2febfda60a0437bc0e7
tree8443f1b0bb5933c787fac6095e04a97bc4a00ac9
parentd4e5872d82aaaea70c995a1424a785e8aef30f05
parent94a4f6465543c6d383d14cf4f4262c754efb340d
Merge "Merge "Emulator-ATV: Add SdkSetup provision app" into nyc-dev am: 38689a6fef am: dcbc47d338" into nyc-mr1-dev-plus-aosp
am: 94a4f64655

* commit '94a4f6465543c6d383d14cf4f4262c754efb340d':

Change-Id: I8d7ee1d6bcfd71e51bc0ed870d46bc1f0f9edbd8