am 31655d9c: am 7af26353: Merge klp-dev-plus-aosp into stage-aosp-master

* commit '31655d9c34105df979823546d7d2cf3ed67ee130':
This commit is contained in:
Bill Yi 2014-04-30 00:53:08 +00:00 committed by Android Git Automerger
commit c58b5cb012

Diff Content Not Available