tree e70943097ba998b03a6f285179568c49abd54f7f
parent 6e212cf45fc7c048cd651d9e75dae9aa32af5839
parent 42041c59e61f8c25ad8bbd6a2a6236b7ca0fe708
author Steve Kondik <shade@chemlab.org> 1305643984 +0400
committer Gerrit Code Review <gerrit@review.cyanogenmod.com> 1305643984 +0400

Merge "Revert "fix build"" into gingerbread