| commit | dd90e8b5a200829cae68fa1a95eb1e3ed09583cf | [log] [tgz] |
|---|---|---|
| author | Conley Owens <cco3@android.com> | Wed May 15 15:00:10 2013 -0700 |
| committer | Conley Owens <cco3@android.com> | Wed May 15 15:00:10 2013 -0700 |
| tree | b5bf0ed00785b7afe2f6fa67408e6ec4f180e7a4 | |
| parent | 0d0d868f5fbd549728e9ca4dea738f4663e076c4 [diff] | |
| parent | 72c324efd5a0f632d8f2b57b9f587a540d809b82 [diff] |
Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev -s ours, so that jb-mr1-dev-plus-aosp can continue fastforwarding to jb-mr2-dev.