| commit | 03b1fa7e0ebcebcc5ffcb780d88ab850f02a97c8 | [log] [tgz] |
|---|---|---|
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | Fri Dec 06 03:16:05 2013 +0000 |
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | Fri Dec 06 04:21:20 2013 +0000 |
| tree | 7f3f36df6d82d9d18c00ee1a7cd76a1d254a1ff6 | |
| parent | d0cf2604e13dc9b98cf4d7ec4226c8ae9a70c1b6 [diff] | |
| parent | 18fc094c0ed41851be3d746423c6695dd28d48e1 [diff] |
Merge tag 'android-4.4.1_r1' into HEAD Android 4.4.1 Release 1 Conflicts: audio/AudioPolicyManagerBase.cpp Change-Id: I89ac037649e05540e85f7497e416f85032210776