| commit | 2c41c8eb2b3014ddb4de53fec533edfa47a96db3 | [log] [tgz] |
|---|---|---|
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | Tue Apr 15 01:23:46 2014 +0400 |
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | Tue Apr 15 01:23:46 2014 +0400 |
| tree | 2a11d9b2fbc72598589523742eac98af3a09d3ff | |
| parent | dbb07139ef78699b07137e3974aa9638cfa2d57a [diff] | |
| parent | 2609fbf2f5158f57b1c41a5fa2c18fffc6016342 [diff] |
Automatically merging tracking-linaro-android-3.14 into merge-linux-linaro-core-tracking Conflicting files: