tree 6df6ce510ea1ee3f1c346b68442ef015f31535da
parent bf759adf8fcd3b4de74522d1f14b059f467e3dd2
parent b513fe72793634a65432b51ddbde405d9ed59e6b
author Dmitry Shmidt <dimitrysh@google.com> 1256329935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256329935 -0700

am b513fe72: (-s ours) am f87aecff: Change kernel path (do not merge)

Merge commit 'b513fe72793634a65432b51ddbde405d9ed59e6b'

* commit 'b513fe72793634a65432b51ddbde405d9ed59e6b':
  Change kernel path (do not merge)