| commit | 161314c80ba7aab8179b2c51ebc89fdd6f597557 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Thu Oct 10 12:00:41 2013 -0700 |
| committer | Raphael Moll <raphael@google.com> | Thu Oct 10 12:00:41 2013 -0700 |
| tree | af4004d715fc81d62e6373fdeb4cde595bf97e60 | |
| parent | 3f12dac94da218f6a706a30201ac7bc06fe4b8ae [diff] | |
| parent | 14794b209c54c5888932a0f4b57f2dd0995bfd87 [diff] |
resolved conflicts for merge of 14794b20 to klp-dev Change-Id: Idfdd970a9c90ca91c23f1780457c6fd8a3644cdc