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

* commit '7757a5fa2ba689551b9c5312c8f19c5db06fd77d':
This commit is contained in:
Xavier Ducrohet
2014-05-13 15:17:09 +00:00
committed by Android Git Automerger

Diff Content Not Available