tree 132f6a62002bb80dd84fd96cd41eb1f36647e300
parent 2641f715c987ba560d246adf95e5e5434d70c6db
parent 498508c1187dc07d3eae5476784cde20f5224d93
author Elliott Hughes <enh@google.com> 1318889301 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1318889301 -0700

Merge "Clean up the makefile and add a missing 'static'." into dalvik-dev