ref: 93529bd7c1ebef578e8a8026aec04ffbec745438
parent: ef179bce61a5c02fb8fc10b73258cf0b68ec86c2
parent: 8a3f55f2d459b1de112502d32719ffa56fe7604c
author: John Koleszar <jkoleszar@google.com>
date: Mon Mar 18 09:02:07 EDT 2013
Merge "Replace scaling byte with explicit display size" into experimental