Merge "Emulator-ATV: Add SdkSetup provision app" into nyc-dev
authorbohu <bohu@google.com>
Thu, 28 Apr 2016 22:40:12 +0000 (22:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Apr 2016 22:40:12 +0000 (22:40 +0000)
commit7e247f7bed82119a280fa87a47449c08d0270256
tree8443f1b0bb5933c787fac6095e04a97bc4a00ac9
parenta28dda0daf3accbb934b72c274b60acd1150037f
parent38689a6fef297b99afbe263e6e15101ee48c193b
Merge "Emulator-ATV: Add SdkSetup provision app" into nyc-dev
am: 38689a6fef

* commit '38689a6fef297b99afbe263e6e15101ee48c193b':
  Emulator-ATV: Add SdkSetup provision app

Change-Id: I480a686d101680e2e28b67ea41a6611c04bad1e4