| commit | a02eeb6598f743fef3feda220bc884439b07b90f | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Mar 07 10:30:37 2014 -0800 |
| committer | Christopher Ferris <cferris@google.com> | Fri Mar 07 10:30:37 2014 -0800 |
| tree | 46289847ad28115523f3c44958f14958727b1c93 | |
| parent | d2ac7c9f136c834817a008b05f2a9a0712957b96 [diff] | |
| parent | 385a94dd3f9e11acd492a0ea66f067a2e3e18b91 [diff] |
resolved conflicts for merge of 385a94dd to klp-dev-plus-aosp Change-Id: I30c6ed77052f2e7b4f82247231c6559b88d1caba