tree f1347398e5d11796b532f0dc1372530bef9c51d5
parent e8ce7584301f7fa72c83a124f4e2e909c0a63f03
parent 2472128a5cada24799f1bcaafcbf5e0ad70da4f6
author Xavier Ducrohet <xav@google.com> 1385495600 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385495600 -0800

am 2472128a: am 888bd6a1: Merge "Prepare SDK for KLP MR1. Do not merge." into klp-dev

* commit '2472128a5cada24799f1bcaafcbf5e0ad70da4f6':
  Prepare SDK for KLP MR1. Do not merge.