| commit | 52cefc36cf4718cd85e6e35832b2a8674ba9e838 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Feb 18 11:17:53 2014 -0800 |
| committer | Ying Wang <wangying@google.com> | Tue Feb 18 11:17:53 2014 -0800 |
| tree | df0cdc9de12d1fb387e390043752446d6bf53dc3 | |
| parent | 0003192c32ff9672a3974709912acc853053c7a8 [diff] | |
| parent | 6ca56b6ae761edb79eed5e7df158204efa6dd26c [diff] |
resolved conflicts for merge of 6ca56b6a to klp-modular-dev-plus-aosp Change-Id: I8f647bb5ff9a4de1fbdbfb1dae169e547aeba3ce