| commit | 1101548c9ea6f9b978b6caa433cb8b778c911b98 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu Jun 05 13:38:27 2014 -0700 |
| committer | Brian Carlstrom <[email protected]> | Thu Jun 05 13:38:27 2014 -0700 |
| tree | 207724aa3a79d1c75aa4471d34902b9bf726195c | |
| parent | 6214a600624d89ced651f2b4aa70815ab6672ec6 [diff] | |
| parent | fabfed752766519288a95a259564a381652cd2ea [diff] |
resolved conflicts for merge of fabfed75 to klp-modular-dev-plus-aosp Change-Id: If7ed9e0d1cd1129e556d78a0ff340e913862aff0