tree b29e1f365d0c5852c25a5b3ec52dd125588f4ca3
parent 85e428291d2a569d5d9af1d749b69e9a646064fc
parent 7314eb087f7318118fbf80827789a2626a8f66b5
author Michael Wright <michaelwr@google.com> 1378420435 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378420435 -0700

am 7314eb08: Merge "Fix broken copy of kl/kcm/idc files to system image" into klp-dev

* commit '7314eb087f7318118fbf80827789a2626a8f66b5':
  Fix broken copy of kl/kcm/idc files to system image