| commit | afac0a4580b73cd500d3ec0d8c23135ec7fe9767 | [log] [tgz] |
|---|---|---|
| author | Santos Cordon <santoscordon@google.com> | Wed Aug 28 22:07:14 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Aug 28 22:07:14 2013 +0000 |
| tree | c168d7fc884ea20f5b88f3a7ee80a79ba35abc7d | |
| parent | a6caf98cb2a3cdadbe107a2cc9f46cd3e2f9cfc6 [diff] | |
| parent | 19d814b12a6ba77ba93ee5d8f3b46ca979d8e5ca [diff] |
Merge "fixing merge conflict" into klp-dev