| commit | 668b1bf80b0e34e7079f826cd9e7358835a1e9cd | [log] [tgz] |
|---|---|---|
| author | Adam Hampson <ahampson@google.com> | Tue Apr 08 10:24:47 2014 -0700 |
| committer | Adam Hampson <ahampson@google.com> | Tue Apr 08 10:24:47 2014 -0700 |
| tree | 153ee3ce06efcfb1f1e75cfa04d1016b39bd92cc | |
| parent | 56868fbcd9b086219c4350ac34b5dfdde127c5b9 [diff] | |
| parent | bd6c5577ab0790415b99d24f41b7b3cdd823449d [diff] |
resolved conflicts for merge of bd6c5577 to klp-modular-dev-plus-aosp Change-Id: I993d4baf89b3f414ac3ad313c74afe340c11f28f