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

This commit is contained in:
The Android Automerger 2013-11-06 06:00:25 -08:00
commit a8011a2342

Diff Content Not Available