| commit | 4797e430d892664fc83b8a6f93a2f74c621b8f9e | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu Jun 05 20:44:31 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu Jun 05 20:44:31 2014 +0000 |
| tree | 60d7613c3615dd2cfef2171eff882a556961bdcb | |
| parent | 581e6bdd03b82570fe3860110a61474837fa8779 [diff] | |
| parent | 1101548c9ea6f9b978b6caa433cb8b778c911b98 [diff] |
am 1101548c: resolved conflicts for merge of fabfed75 to klp-modular-dev-plus-aosp * commit '1101548c9ea6f9b978b6caa433cb8b778c911b98': Fix Early CCS bug