| commit | 0f5b04f2416b359db14927a55f67e7c618346e5f | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Thu Dec 01 11:48:20 2011 -0800 |
| committer | Jeff Sharkey <jsharkey@android.com> | Thu Dec 01 11:50:15 2011 -0800 |
| tree | 6a0343adfbf8d163bf2f0bae68b71f799c201c73 | |
| parent | c6832775d16bcb7e7fd11b577fd9e4ce86f34d49 [diff] | |
| parent | 8628ec7a18af23688a9a6b185914aa4d7170e0b9 [diff] |
resolved conflicts for merge of c0715fd5 to master Change-Id: Iab2221b984c2b86d0b220466f58368fbf1af5e20