| commit | 2fbcc399eaac8ccae99bc8fe1a62a271a935c1ab | [log] [tgz] |
|---|---|---|
| author | Jason Sams <jsams@google.com> | Fri Feb 10 15:27:26 2012 -0800 |
| committer | Jason Sams <jsams@google.com> | Fri Feb 10 15:27:26 2012 -0800 |
| tree | cc601c2c420c5235b4e1526d29509c568f4eb13e | |
| parent | cc5519c3ef53bede1982583f4a621b35f16a8b59 [diff] | |
| parent | a64366ee40f6ec2df7388cbc7f06e03f9e886bcd [diff] |
resolved conflicts for merge of cb66aec0 to graphics-dev Change-Id: Ic8817f702b6993f046c89f2fc598c9fe3bf30fe8