| commit | 696aeb4e78b73a4ae6e51e95ccbe18e5ceec4d69 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Wed Aug 08 16:39:00 2012 -0700 |
| committer | Jeff Sharkey <jsharkey@android.com> | Wed Aug 08 16:39:00 2012 -0700 |
| tree | b8183914356bd1d606c17ef27cb1cd3a85366348 | |
| parent | 5f4cd1dfef47e46b87f7aa7021e114aa39ab704a [diff] | |
| parent | 9844730f62d1bf9265a2447cd36ad4a6bcb015c1 [diff] |
resolved conflicts for merge of ab4e251a to master Change-Id: I59ad9fe6e777c6677331f83d5e1de28b66f28af7