| commit | bc2b05299d5fb369aa5c912ccad8e8e3ade06d90 | [log] [tgz] |
|---|---|---|
| author | Robert Ly <robertly@google.com> | Sun Jun 29 17:55:24 2014 -0700 |
| committer | Robert Ly <robertly@google.com> | Sun Jun 29 17:55:24 2014 -0700 |
| tree | c7da007c1eadd5a0b63ecd9691e629bee070ac0c | |
| parent | 05759ef766b85a2987bcd8c92d246b186a6ddded [diff] | |
| parent | 4d329a8f12253ed514ca422922e34d41fee29e77 [diff] |
resolved conflicts for merge of 4d329a8f to klp-modular-dev-plus-aosp Change-Id: Id8096712bc63fe16f93dca4a7963440e11087f7a