Merge "Emulator: bump ATV sdk system image revision to 4 am: c2d3a77705 am: 1aefcdcf8...
authorbohu <bohu@google.com>
Wed, 25 May 2016 00:36:00 +0000 (00:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 00:36:00 +0000 (00:36 +0000)
commit3dfc124e4db9f86d1c4215a7601fc2b6efc5b34c
tree9fc2e2635d3dbee5e126dbc38e1277ab93732cec
parent6d2a5484b67e3d9ce2b703788eb1b7fedbc7ad2f
parent0204b3e157f9f516e5a3053e3391513d71ddc1cb
Merge "Emulator: bump ATV sdk system image revision to 4 am: c2d3a77705 am: 1aefcdcf8e" into nyc-mr1-dev-plus-aosp
am: 0204b3e157

* commit '0204b3e157f9f516e5a3053e3391513d71ddc1cb':

Change-Id: Ie3161f0c5783b861e95fdfcaf29fa592d540eb11