DO NOT MERGE ANYWHERE Emulator: bump ATV revision to 2 for next preview release am...
bohu [Tue, 25 Oct 2016 01:16:56 +0000 (01:16 +0000)]
am: 069c5235cd  -s ours

Change-Id: I8a8671638b450aa7b85216f18737b36891b7a11b


Trivial merge