| commit | 2f368e57e58c6bc3ab291d6318b19c6698fc184b | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Wed Oct 22 01:21:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 01:21:05 2014 +0000 |
| tree | a31856463080cc988378d937e59c7318c1b815ca | |
| parent | 3873c920b830fcea2979a5bf6097bfd5810957f9 [diff] | |
| parent | c3ddddbd4ec1fe2c570a25925db6b396fb83badf [diff] |
Merge branch 'lmp-sprout-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-sprout-dev