| commit | e38b1c4d156a569efc646e86a72ab3a3e3ccf6fc | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Jun 08 13:47:46 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Fri Jun 08 13:47:46 2012 -0700 |
| tree | ea11a80486d1d4d68828db9fb0660c256a1a1d10 | |
| parent | af2ab39abad1c0481af471e60a299fb2839d608d [diff] | |
| parent | 9855f6e210afc8e88ec1da12abe3871ef70e1bea [diff] |
resolved conflicts for merge of 9855f6e2 to jb-dev-plus-aosp Change-Id: I012bd3b5946dedba3439285caa93739d44ebc60f