| commit | f801cf55bebc8d0d397fbe6db8cc91b3afb78149 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Sep 12 16:08:14 2012 -0700 |
| committer | Elliott Hughes <enh@google.com> | Wed Sep 12 16:08:14 2012 -0700 |
| tree | a45eaf32f0a057f7e4b3fb7db2333d9c84491b0c | |
| parent | ccd7ee624a81d61675fa08e149fe190a317341eb [diff] | |
| parent | 47bda0c293c167f12ddde6e66192ad581c4a67e1 [diff] |
resolved conflicts for merge of 47bda0c2 to jb-mr1-dev Change-Id: Ia1969c79111c006bde709920254a515646c20aa7