| commit | c1b5258fe0d244be2d4d8c4d2969c1b8859c6fa8 | [log] [tgz] |
|---|---|---|
| author | Alice Yang <alice@google.com> | Mon Mar 04 19:54:00 2013 -0800 |
| committer | Alice Yang <alice@google.com> | Mon Mar 04 19:54:00 2013 -0800 |
| tree | c0ed5e69ad04da81b79350708330ddade6b64f57 | |
| parent | d215b8fd8911e0c0c85947fd6b8f774b021f97a7 [diff] | |
| parent | f0579ee4ab41c021f20f78b25ecf4c526b308ec6 [diff] |
resolved conflicts for merge of c4d46df7 to jb-mr2-dev Change-Id: I8d4c64832f989c70ef432730ab584e3dc71ad004
