| commit | 5e43150fba668dfb8e4f5eaf02caff6a8bd2456d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Thu Jun 05 21:43:41 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Thu Jun 05 21:43:41 2014 +0000 |
| tree | b98f769dcab8326c846f24c86fcfdd09d69abe49 | |
| parent | fabfed752766519288a95a259564a381652cd2ea [diff] | |
| parent | d91503d957a5cea5cd8197de57f764a02f2cfa61 [diff] |
am d91503d9: am cf15f43b: resolved conflicts for merge of f021a8c5 to jb-mr2-dev-plus-aosp * commit 'd91503d957a5cea5cd8197de57f764a02f2cfa61': Fix Early CCS bug