| commit | 1a3b024d2608a11260f49943cfde262396d6ddc1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Mar 04 19:10:07 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 04 19:10:07 2013 +0000 |
| tree | ae1c787f11126f89049455cbea1bde07a0d5189f | |
| parent | 6f3622af944fc54c7d6add763584cd83bccd7ad9 [diff] | |
| parent | 68fa5114fe56297763a50a9090793eaae300aaa2 [diff] |
am 68fa5114: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '68fa5114fe56297763a50a9090793eaae300aaa2': Add directory for mediaserver