LiquidSmooth/android_dalvik — pull request #1 by CPA-Poke (2013-12-03 05:57:18+00:00)
Title: Remove merge conflict

Looks like this little guy got missed somehow...figured I'd try to save you some time.