| commit | 0bdc9f08a3b1cb39bb306a20153be3379e69dc4b | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Nov 21 18:37:20 2013 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Thu Nov 21 18:39:30 2013 -0800 |
| tree | 11e9a1e755ae727d39e0e88c17a2af4222e65bb8 | |
| parent | 00a8f245f5c91b1a61bf5ca3ca690c52496c8731 [diff] | |
| parent | ee32438e82fbb43838cbc05c0c677d2437ed5cee [diff] |
resolved conflicts for merge of ee32438e to klp-dev-plus-aosp Change-Id: I40cb17f0392ca98378ec5349d200750c51cc0e6a