| commit | 76a19722646bbfe29bcab2a1062848799b35c9c8 | [log] [tgz] |
|---|---|---|
| author | Martin Hibdon <mhibdon@google.com> | Fri Mar 27 01:23:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 27 01:23:46 2015 +0000 |
| tree | 3c0c55403f74bd87955e1570faf33a4b52a91ff4 | |
| parent | fb7b0f3d27c53096708cea23aa4dc7e829ef36d7 [diff] | |
| parent | 67b7360bf52280efa4652420656b2ceddcd7c1bd [diff] |
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-mr1-ub-dev