am 2c79b4f6: snap to klp-dev-plus-aosp 3f69e99 with history

* commit '2c79b4f6cec4c8d5976bf4d07e6b03c1ab303e2d':
This commit is contained in:
Qiwen Zhao
2013-12-06 21:57:22 +00:00
committed by Android Git Automerger

Diff Content Not Available