| commit | 024934a822e55cde7209b32ce427c303c6bddef2 | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Wed Aug 28 15:40:38 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 28 15:40:38 2013 -0700 |
| tree | c168d7fc884ea20f5b88f3a7ee80a79ba35abc7d | |
| parent | bb47f76251a7c469f44280b6345ba78bcf55e63c [diff] | |
| parent | afac0a4580b73cd500d3ec0d8c23135ec7fe9767 [diff] |
am afac0a45: Merge "fixing merge conflict" into klp-dev * commit 'afac0a4580b73cd500d3ec0d8c23135ec7fe9767': fixing merge conflict