| commit | b9b21bc11bfb6e77cc0f9e9a31de02342ab9d653 | [log] [tgz] |
|---|---|---|
| author | Chong Zhang <chz@google.com> | Wed Oct 22 20:47:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 22 20:47:41 2014 +0000 |
| tree | c9150aae583ee04a6120fd37f9784eb3abd78157 | |
| parent | 7a337b8f4c49588e350ec47f214c35fadaa9af29 [diff] | |
| parent | 2f368e57e58c6bc3ab291d6318b19c6698fc184b [diff] |
am 2f368e57: Merge branch \'lmp-sprout-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-sprout-dev * commit '2f368e57e58c6bc3ab291d6318b19c6698fc184b':