| commit | c15b7865badc3ac406a7ce978baa65151a50bb55 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Tue Mar 11 19:39:26 2014 -0700 |
| committer | Doug Zongker <dougz@google.com> | Tue Mar 11 19:39:26 2014 -0700 |
| tree | 4298bb59e37a9f1ea05e89391564c3bb13f75732 | |
| parent | 49968f0903eb69b1505bc99926344aacee4e81b6 [diff] | |
| parent | ea868b3846794cd36424f477503377ea9348137a [diff] |
resolved conflicts for merge of ea868b38 to klp-modular-dev-plus-aosp Change-Id: I8cc3b8101bccf7fd697f9a7b73732d1000dc27a1