tree fba6500497e7c2a20437856c9f936e93bad4064f
parent 8c5cb392b8d6c9d52d5072b7849753f9dfe27c74
parent f5736fd45ed9895817ad3f7eb1efe081ab4949e3
author Android Build Merger (Role) <android-build-merger@google.com> 1481126359 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1481126360 +0000

Merge "DO NOT MERGE ANYWHERE Emulator: bump Google ATV SDK revision to 3 am: 6967ab1e7b  -s ours am: c9e09b117d  -s ours am: b99545f86a  -s ours" into nyc-mr2-dev-plus-aosp