Merge commit 'remotes/korg/cupcake' into merge
[android/platform/frameworks/opt/com.google.android.git] /
-rw-r--r-- Android.mk
-rw-r--r-- framework.jar