| commit | 834690891ee18371934c44408ac52abe096d3145 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Tue Jun 17 19:52:18 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Tue Jun 17 19:52:18 2014 +0000 |
| tree | d062db9d124104b1d9af70e615fb160ae2b6d60f | |
| parent | e03b8beed2f9436bbc82301990790f676acfd91f [diff] | |
| parent | 24029085da463341e6f78b80250548ddfd6b386e [diff] |
am 24029085: am e4875786: am 1a4208b6: resolved conflicts for merge of cd4735f3 to jb-dev-plus-aosp * commit '24029085da463341e6f78b80250548ddfd6b386e': DO NOT MERGE: Fix Early CCS bug