tree fba6500497e7c2a20437856c9f936e93bad4064f
parent 325f52cd91ed26b9dc9cd05680f1edc6a2d8607c
parent 7ee3495230d1d194c4ca0252f0490d6e3cedf411
author bohu <bohu@google.com> 1479940130 +0000
committer android-build-merger <android-build-merger@google.com> 1479940130 +0000

DO NOT MERGE ANYWHERE Emulator: bump ATV revision to 2 for next preview release am: 7b25e32e18  -s ours
am: 7ee3495230  -s ours

Change-Id: I376767a9bf2973b3874e0dbd35661961e45b300d