| commit | 5bdfc00c3978750d2d3fbe172c70a205d01923bb | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu Jun 05 22:03:33 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu Jun 05 22:03:33 2014 +0000 |
| tree | 0458326afea4953153b17051ae35c04748ae647c | |
| parent | d91503d957a5cea5cd8197de57f764a02f2cfa61 [diff] | |
| parent | 5333843125f97b0635f3b07c730ee789d3f7ab63 [diff] |
am 53338431: am e03b8bee: am ce79d641: resolved conflicts for merge of 4a040c3a to jb-mr1-dev-plus-aosp * commit '5333843125f97b0635f3b07c730ee789d3f7ab63': Fix Early CCS bug