| commit | 00a8f245f5c91b1a61bf5ca3ca690c52496c8731 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Nov 21 18:17:34 2013 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Thu Nov 21 18:17:34 2013 -0800 |
| tree | dd52fda47372aaaf64ad76885f547544a09527aa | |
| parent | eaa0add6aaa503221a530d346a3b4a066bc46449 [diff] | |
| parent | 5af4cc5a4e2917f8b3528882a444f93f5838c952 [diff] |
resolved conflicts for merge of 5af4cc5a to klp-dev-plus-aosp Change-Id: Id64c8048aab28487a7e311ed0f9b89b491d3c2ac