| commit | 492268689201f4ad4704eb68bbaaf39042cae386 | [log] [tgz] |
|---|---|---|
| author | Kevin Ma <kma@google.com> | Tue Jun 10 19:17:55 2014 -0700 |
| committer | Kevin Ma <kma@google.com> | Tue Jun 10 19:17:55 2014 -0700 |
| tree | c0b05a2ef9b4ff9ffc0ce2264c0dcd9362969cba | |
| parent | d5d85af4485258a685953d8090f11852240f33fb [diff] | |
| parent | b18a277aa5534a8744f640cdc8aa60282172a922 [diff] |
resolved conflicts for merge of b18a277a to klp-modular-dev-plus-aosp Change-Id: I467fc4ea78c7a5bf17d943db24e24a33f15d1fff