tree 3a419ea042e1f8c15c0e615b042b3fdf4a0e3878
parent 22b85cc1144b0710a611ac8e0568b73fe3a52368
parent d7b480ae7cf8edd2689ad777a6015aaf417bad4e
author The Android Automerger <android-build@google.com> 1379477449 -0700
committer The Android Automerger <android-build@google.com> 1379477449 -0700

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