| commit | 2d17b1aba6ea529dc618d50c784f69fb7f1a8141 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Oct 03 12:13:38 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Oct 03 12:13:38 2012 -0700 |
| tree | 7b6e5b3c23d037ba88990e863bf188f9da772e87 | |
| parent | 3ee91251be45830522c6a0aa8d2c145b08b5f327 [diff] | |
| parent | 01b2aaaa89447759d3f80ae8db58098a428fdc3c [diff] |
resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288