| commit | 56e6fc57387e6b8ff39c0744cf4ee4dd089ae3f1 | [log] [tgz] |
|---|---|---|
| author | Dirk Dougherty <ddougherty@google.com> | Mon Nov 04 19:02:52 2013 -0800 |
| committer | Dirk Dougherty <ddougherty@google.com> | Mon Nov 04 19:06:04 2013 -0800 |
| tree | 28a4640f63065973c4d0322969870f66ac21e487 | |
| parent | c3ce4221663f4d8ed740642f5342aa4ad757f225 [diff] | |
| parent | ad209a9385cee1ca212651e02ec649c44d7de06e [diff] |
resolved conflicts for merge of ad209a93 to klp-dev-plus-aosp Change-Id: Ie7549ffc91c167660f8062f5084eaae28a8ea7d1