| commit | 20f5daa8653eb2d81af8c161a2084e3b53ec3914 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Oct 16 17:51:14 2012 -0700 |
| committer | Kenny Root <kroot@google.com> | Tue Oct 16 17:51:14 2012 -0700 |
| tree | 716474f1851ccb7de43bc9806bc1bcae2e264476 | |
| parent | d94301799518a69f2b2b5a2b20bf9d4403658d7e [diff] | |
| parent | 44f4f8a4d2bef6e9fc37cd50076295102b38828a [diff] |
resolved conflicts for merge of 44f4f8a4 to jb-mr1-dev-plus-aosp Change-Id: I66988d8e87a8110ca9ab3da19870b80bbaf06eba