| commit | bae2fe870af85ced407525735b2849ea0b2a1673 | [log] [tgz] |
|---|---|---|
| author | Chris Wren <cwren@android.com> | Thu Jun 21 16:46:14 2012 -0400 |
| committer | Chris Wren <cwren@android.com> | Thu Jun 21 16:46:14 2012 -0400 |
| tree | ee8b012ae14ed9479dfd1baa0596b10d4e5db2c8 | |
| parent | 49d03616abef47f08347a58f60b55174a52a469e [diff] | |
| parent | 0a43f67ef3c2551ae051da7bf2e856ddc051298d [diff] |
resolved conflicts for merge of 0a43f67e to master Change-Id: I072b756bc501c7669593eff012b120905a2fd962