| commit | f195b80c2b8d40211cd91665fc9d2f62ad47f91d | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Tue Jun 12 11:10:26 2012 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Tue Jun 12 11:10:26 2012 -0700 |
| tree | ac5f98e5a031915bd32b8321d305def24bb28d76 | |
| parent | 6e66823873915bfd6e6c7b9b5c92e1e7e010977f [diff] | |
| parent | 926a5c507b2e532d1f1348dc8a5672b76ae1f4dc [diff] |
resolved conflicts for merge of 926a5c50 to jb-dev-plus-aosp Change-Id: I1426b282bb4c392b0a5bcb96760c04f215a26b4e