Merge "Add missing includes for multi-res"
authorJohn Koleszar <jkoleszar@google.com>
Thu, 22 Dec 2011 21:01:19 +0000 (13:01 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Thu, 22 Dec 2011 21:01:19 +0000 (13:01 -0800)
commit2d8d15a71cb24e6bf90881af528ea713f517f1d5
tree7f0639ba9fac233459b6a7416336c280e7c178c0
parent03fadc4b20e7c1948b23f383e2a6bc544379e519
parent09080d4e5e4f4070aca31239c49f0c78744037a3
Merge "Add missing includes for multi-res"