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

* commit '7af263533d2c25b4cdd4769cbcebc080e72056b9':
This commit is contained in:
Bill Yi
2014-04-30 00:49:34 +00:00
committed by Android Git Automerger

Diff Content Not Available