| commit | b8292830f79fc76ffb9a1be5cd316212ac494d03 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jun 28 16:50:13 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Fri Jun 28 16:50:13 2013 -0700 |
| tree | 27c919fddab0a364276ee157ff3f0e8bc6fc7f2e | |
| parent | d1411efee372a37fcd0178f3ccffd9bf1d67b70b [diff] | |
| parent | a920f25fe55fc9afc7640902a200f19ce278588b [diff] |
resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6