tree 44516506a888e44c1f901b30bcb28afa8a889ac4
parent 241dbd1565b3693bfc2cc9ee3e9e50bcd2f8a7f0
parent 357d3f99e01e30cfc6e9105e8ae8a8914ef48ebe
author The Android Automerger <android-build@google.com> 1383832831 -0800
committer The Android Automerger <android-build@google.com> 1383832831 -0800

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