| commit | e487578672f0b32b852a9fee267748c7617a165f | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Tue Jun 17 19:30:44 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Tue Jun 17 19:30:44 2014 +0000 |
| tree | 2c2b3c618ce403524a1e7d0ebf136120f1e7518e | |
| parent | 4a040c3a29ff0c6f0384f3f77c113ad22316570c [diff] | |
| parent | 1a4208b6667dbd4db07d455b2b91d3fb23b447c7 [diff] |
am 1a4208b6: resolved conflicts for merge of cd4735f3 to jb-dev-plus-aosp * commit '1a4208b6667dbd4db07d455b2b91d3fb23b447c7': DO NOT MERGE: Fix Early CCS bug