| commit | 5c679d41714e42f153f6aeb492df54510a195bc1 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Mar 21 17:43:32 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Fri Mar 21 17:43:32 2014 -0700 |
| tree | b8100421f7339771067ad447d94ad2a5f6494068 | |
| parent | ba1390335794a38472bf0349568bc4f199dc5c90 [diff] | |
| parent | 3d7c500234d98464d37ba3e1b65cea763b316b69 [diff] |
resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp Change-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db