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

* commit 'c5686e155cd130edfcf9dfc5657268f3734712a7':
  Prepare SDK for KLP MR1. Do not merge.
This commit is contained in:
Xavier Ducrohet
2013-11-27 10:47:53 -08:00
committed by Android Git Automerger

Diff Content Not Available