| commit | edadbf2bdc9428404179a8eca67ff7f9b7ed83da | [log] [tgz] |
|---|---|---|
| author | Yuichi Araki <yaraki@google.com> | Mon Sep 08 04:45:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 08 04:45:02 2014 +0000 |
| tree | 6ed3a6eca2f203bda918f3b4904e2684fce159bf | |
| parent | f7d67da908a31eaef2af69879a677314ca05ffa1 [diff] | |
| parent | b1f7b5568fc4ac09fec6bafca2122fce3a6451f1 [diff] |
am b1f7b556: am f33e8988: Merge "MediaEffects: Porting from HelloEffects sample." into klp-modular-docs * commit 'b1f7b5568fc4ac09fec6bafca2122fce3a6451f1': MediaEffects: Porting from HelloEffects sample.