| commit | d91503d957a5cea5cd8197de57f764a02f2cfa61 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu Jun 05 21:35:59 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu Jun 05 21:35:59 2014 +0000 |
| tree | 0458326afea4953153b17051ae35c04748ae647c | |
| parent | 9c58a18df94359edda520ebe95f6e0263e401aa4 [diff] | |
| parent | cf15f43bc92fa6c911a7a2d0722ff19f9334bd49 [diff] |
am cf15f43b: resolved conflicts for merge of f021a8c5 to jb-mr2-dev-plus-aosp * commit 'cf15f43bc92fa6c911a7a2d0722ff19f9334bd49': Fix Early CCS bug