| commit | 1a62f5d8e777eed3486d7abc3bb03daa94f16bf9 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Mar 11 09:31:45 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Tue Mar 11 09:31:45 2014 +0900 |
| tree | b71c1ae1354d1214940af1a9815e961b7bd53177 | |
| parent | 48ce8aaf3d9baa735b047833451228657266b068 [diff] | |
| parent | 07f0265830fcae2632159e9993b93a161d7ea23b [diff] |
resolved conflicts for merge of 07f02658 to klp-dev-plus-aosp