| commit | aacbd66c09da675765bce6e0dc0f1dc626b4806f | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Fri Nov 21 12:17:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 21 12:17:42 2014 +0000 |
| tree | 9ac65ff0b188737df22d2da28f2badaa069727de | |
| parent | 5b19b5a83507f89b69aee76678df5b6cf9175bda [diff] | |
| parent | dbdc93b10a14bd519ceeac2003091aa869c3d572 [diff] |
am dbdc93b1: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/system/media into lmp-mr1-dev-plus-aosp * commit 'dbdc93b10a14bd519ceeac2003091aa869c3d572':