| commit | 8d111e9b7f016a78090652530d5d66f93be72613 | [log] [tgz] |
|---|---|---|
| author | Andrew Sutherland <dr3wsuth3rland@gmail.com> | Tue Aug 07 22:00:43 2012 -0500 |
| committer | Andrew Sutherland <dr3wsuth3rland@gmail.com> | Tue Aug 07 22:00:43 2012 -0500 |
| tree | 9645932b70eff1089db7f5074b98f8ea511a013a | |
| parent | 082c723cf024dcad75ad895dfed7ec348d7a67af [diff] | |
| parent | 7c86dfe139a930502d77b13cb55540014429ace2 [diff] |
Merge remote-tracking branch 'caf/jb' into jelly Conflicts: common.mk Change-Id: I512d7e14264192b716e0c5921b685e995853d4f6