| commit | 1a96f3980e7a7017d425352fae65f6b792d1ec48 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Tue Jun 17 20:00:15 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Tue Jun 17 20:00:15 2014 +0000 |
| tree | f512a6a85240e54778b03831e706b78ee76d1c7e | |
| parent | 5333843125f97b0635f3b07c730ee789d3f7ab63 [diff] | |
| parent | 834690891ee18371934c44408ac52abe096d3145 [diff] |
am 83469089: am 24029085: am e4875786: am 1a4208b6: resolved conflicts for merge of cd4735f3 to jb-dev-plus-aosp * commit '834690891ee18371934c44408ac52abe096d3145': DO NOT MERGE: Fix Early CCS bug