| commit | 5bce804ce63270ac68e7d7cc1d00d48119678ce9 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Mar 11 12:13:02 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Tue Mar 11 12:13:02 2014 +0900 |
| tree | 0f35a951cc9ea920a0143e955c503328a8b26336 | |
| parent | 5d7878eaaa04843bb1fb65d4aa72f58459c72c33 [diff] | |
| parent | 13a58c4859164d9f16e124b0f85c35a061dec76d [diff] |
resolved conflicts for merge of 13a58c48 to klp-dev-plus-aosp Change-Id: Idfca8179c5f9829cf24f53f8e4e7f3f4f32234b0