| commit | 4888fe345306cd747b03757a01089683a2e6c922 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Tue Apr 01 11:47:16 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Tue Apr 01 11:47:16 2014 -0700 |
| tree | a8bd6f9afb52824bfc07521dac904ffeb3c4b7c7 | |
| parent | 31061ccfdaf01603dfdf20f15df8021d1c7d0b85 [diff] | |
| parent | cece45d22652ca0d8a57a6cb03c5ca2a915a9a07 [diff] |
resolved conflicts for merge of cece45d2 to klp-modular-dev-plus-aosp Change-Id: Ibec9bab6ec9d46787f521fdaa6a033106d667e76