| commit | f6fb19ad30b1f0e55e9c1efda39fcaf319837bb5 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Nov 14 14:51:03 2013 -0800 |
| committer | Alex Klyubin <klyubin@google.com> | Thu Nov 14 14:52:23 2013 -0800 |
| tree | 109767900bdd91c79a9eef9159a8c5f6f292052c | |
| parent | 01d82556e6ad8b7440ecee8d60333f26d323df04 [diff] | |
| parent | 8629cea4bb842ac8e13caf1979a5463215be259f [diff] |
resolved conflicts for merge of 8629cea4 to klp-dev-plus-aosp Change-Id: Ibd80c5f1a8b7b2fb7b4e77c40e5a0499effff6aa