| commit | 7b6fa877fa4a563b1a731d1fd570ad448e05c87c | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Oct 24 16:38:39 2013 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Oct 24 16:38:39 2013 -0700 |
| tree | 96841a274420714b871878e047a9f6c7b48fac75 | |
| parent | 975a7be6d7859519a3eb7e0d80ec20f697b7dd6e [diff] | |
| parent | 057157d26388cac61ded22206761e22cbf9b1cba [diff] |
resolved conflicts for merge of 057157d2 to klp-dev-plus-aosp Change-Id: I0292e67df2c27c892a5c1769ae6bf177c802c346