merge in klp-mr1-release history after reset to klp-dev

This commit is contained in:
The Android Automerger 2013-11-04 06:00:28 -08:00
commit 606c2f143d

Diff Content Not Available