| commit | 5dfa7c1bbfddb22aa5af06598b93f039b1687285 | [log] [tgz] |
|---|---|---|
| author | rmcloughlin <rmcloughlin@google.com> | Wed Dec 10 22:22:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 22:22:57 2014 +0000 |
| tree | 7bea3188b635383b7122f07cb57f0392dd6c8455 | |
| parent | bd9df749bf5875fb2a1d909b0da920b8f261a419 [diff] | |
| parent | 46b21c65d376112db3f88977ea7fff458799407f [diff] |
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-mr1-dev-plus-aosp