tree 5307221fc09e0a9978598cc62075251e5ee2b290
parent 3a85c6d598f8575a1442278bf3733eec6c5d6a2e
parent 888bd6a12473a4bfca36c691e187d9fc041411fe
author Xavier Ducrohet <xav@google.com> 1385495453 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385495453 -0800

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

* commit '888bd6a12473a4bfca36c691e187d9fc041411fe':
  Prepare SDK for KLP MR1. Do not merge.