diff options
| author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-12-18 17:39:49 +0059 |
|---|---|---|
| committer | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2011-12-18 17:39:49 +0059 |
| commit | 005c973b923c91e977601b12c2f129d374eb9211 (patch) | |
| tree | 90dcbcbed0f8a0983b8f6ed7ad848f47c3a1c5eb | |
| parent | e5f9971b8a4e86382767ea453c31551996210610 (diff) | |
| parent | f78a43b4389a446aad3f61fcfef3e45e0696f532 (diff) | |
| download | base-linaro_android_4.0.3_origen.tar.gz | |
Merge branch 'linaro_android_4.0.1_origen' of git://android.git.linaro.org/platform/frameworks/base into linaro_android_4.0.3_origenlinaro_android_4.0.3_origen
Conflicts:
media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java
0 files changed, 0 insertions, 0 deletions