tree 365e936323b02f4319deb54554e4de1a9a335901
parent db3562dfbaf4653347685bc7262c02a08747ce36
parent 687153cf160d2a422c904a26e0008b769d6ed453
author Jungshik Shin <jungshik@google.com> 1490654758 +0000
committer android-build-merger <android-build-merger@google.com> 1490654758 +0000

Merge "Merge "DO NOT MERGE: Regenerate the golden images for N6 (560dpi) for nougat-cts" into nougat-cts-dev am: af0fb41585  -s ours" into nougat-mr1-cts-dev am: 9d89b4c74f  -s ours am: d313f3fb13 am: 005e83a209 am: 4033badd68
am: 687153cf16  -s ours

Change-Id: Ia3e8c429d2cea62edb38be0693462c564c7ce2a2