| commit | d26375733992298edc036652d25170e1cd7cbd49 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Oct 11 22:08:57 2012 -0700 |
| committer | Stephen Hines <srhines@google.com> | Thu Oct 11 22:08:57 2012 -0700 |
| tree | 59b5a3e8a0328ab9cff6e31ade50b819aeb2e857 | |
| parent | 9f81546a25b9228a0ccd55d16478d9a0beed5a85 [diff] | |
| parent | ed38fe6fb88955094e3f408a023fdadbd9854f27 [diff] |
resolved conflicts for merge of ed38fe6f to jb-mr1-dev-plus-aosp Change-Id: If699b3ccf1f3befd4df881e3eef6b90dd7c505bf