diff options
| author | Lajos Molnar <lajos@google.com> | 2015-05-02 02:38:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-02 02:38:02 +0000 |
| commit | fe96c1891e42a408247ff6bf8827b3c8ffb68f83 (patch) | |
| tree | 7472d0390720ae8335df161e681ed1a3a40d3f53 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4d3a3429d2dced2a93fa02054fb34d2107e0364a (diff) | |
| parent | 6a667c6fa96d2671a3072bec3a3496183703df12 (diff) | |
am 6a667c6f: am 4971de2a: Merge "media: hook up MediaCodec.setSurface" into mnc-dev
* commit '6a667c6fa96d2671a3072bec3a3496183703df12':
media: hook up MediaCodec.setSurface
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions