| commit | 50db8c0110dbff94dfacc1f4752a927dbe339e9c | [log] [tgz] |
|---|---|---|
| author | Ethan Chen <intervigil@gmail.com> | Fri Nov 14 01:04:45 2014 -0800 |
| committer | Ethan Chen <intervigil@gmail.com> | Fri Nov 14 01:04:45 2014 -0800 |
| tree | fc604545ec971ab0e224c305f0b948edc08295aa | |
| parent | 25b02b6d180efeec13851162c3319962977c1fb0 [diff] | |
| parent | 2f64c5e6faa76368cd2c70c1d48fc4c2d44acbbf [diff] |
Merge remote-tracking branch 'caf/caf/LA.AF.1.1_rb1.5' into cm-12.0