| commit | b4daff987e347d2561e55be129146937d782258b | [log] [tgz] |
|---|---|---|
| author | Ignacio Solla <igsolla@google.com> | Fri Nov 14 19:21:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 19:21:27 2014 +0000 |
| tree | 19bb1e258ad961d939e8dd12b00c62620c643322 | |
| parent | 2acb139210fff39d9c357b90584c295e93f1902f [diff] | |
| parent | 6b6393b570244a4368f2e01d813cc9c4ac4b2f47 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av