| commit | 268c08fcdb2602a78edec8b4b37d4ac708cc39e8 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <[email protected]> | Tue Jun 17 20:04:34 2014 +0000 |
| committer | Android Git Automerger <[email protected]> | Tue Jun 17 20:04:34 2014 +0000 |
| tree | 0458326afea4953153b17051ae35c04748ae647c | |
| parent | 5bdfc00c3978750d2d3fbe172c70a205d01923bb [diff] | |
| parent | 1a96f3980e7a7017d425352fae65f6b792d1ec48 [diff] |
am 1a96f398: am 83469089: am 24029085: am e4875786: am 1a4208b6: resolved conflicts for merge of cd4735f3 to jb-dev-plus-aosp * commit '1a96f3980e7a7017d425352fae65f6b792d1ec48': DO NOT MERGE: Fix Early CCS bug