| commit | 53794a828c67d33f24a2d750a89fcca05bf02150 | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Tue Sep 17 09:52:58 2013 -0700 |
| committer | Alex Klyubin <klyubin@google.com> | Tue Sep 17 09:52:58 2013 -0700 |
| tree | ce2df6dbf1e839f54e2ade3797874ed386297519 | |
| parent | 85850f40fe91a6e77fbcd41946ccd2e5c7fb1b72 [diff] | |
| parent | 8343aa8d1dd3421a0eeb2b275f065996f18628c5 [diff] |
resolved conflicts for merge of 8343aa8d to klp-dev-plus-aosp Change-Id: Ie83126042df3ca277747de5f86b37eaf6f2133a8