| commit | fd4847848031c6642c9e47ab9e932de22f7f2972 | [log] [tgz] |
|---|---|---|
| author | Robert Shih <robertshih@google.com> | Mon Mar 23 15:27:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 23 15:27:44 2015 +0000 |
| tree | 0bdb8de4408e53205807126df684051da7c31fa8 | |
| parent | 457fe12432caac0de0e430bb976dab681b3ae1a2 [diff] | |
| parent | 39b2a5bb953dc7465ff44b897a637ce3d52836d1 [diff] |
am 39b2a5bb: am 214b9dfa: am fe03f73d: libFLAC: merge master from Xiph * commit '39b2a5bb953dc7465ff44b897a637ce3d52836d1': libFLAC: merge master from Xiph