am 8ee5d38a: am fd1a7a32: (-s ours) am 2008b38a: am e30c8885: (-s ours) am 791a5a6a: am 06ba3ef1: (-s ours) am 551a1c24: reset to klp-dev branch to fix merging problem.

* commit '8ee5d38a90dc79dda137653d6d2c7df05c901898':
main
Qiwen Zhao 2013-10-10 08:36:03 -07:00 committed by Android Git Automerger
commit b2cd850234

Diff Content Not Available