| commit | f66796c5ed01ec360a689a7639b6295baa0ce3f6 | [log] [tgz] |
|---|---|---|
| author | Anders Kristensen <andersk@google.com> | Fri Mar 28 11:49:20 2014 -0700 |
| committer | Anders Kristensen <andersk@google.com> | Fri Mar 28 13:09:04 2014 -0700 |
| tree | f754568f0e04f8bbe985bfd5b6bcad5f9f9c03cc | |
| parent | ee0653825f9424fab0e051e317cc11fc3a0a440a [diff] | |
| parent | a3170fa2e80cd35d1677930d667d518d5d258c7a [diff] |
resolved conflicts for merge of 5feee861 to klp-modular-dev-plus-aosp Change-Id: I5e8217fbe5336ebfa91eddf11e7f46465be8f751