tree ebb55c5f2d48a615913ccbe2a0023eb26e943a13
parent dd00a9677b21d2dbdef6b085570e1358f172de80
parent 76936b16c668c0af38fedcdd5e06c1b4944e63d7
author The Android Automerger <android-build@google.com> 1384315237 -0800
committer The Android Automerger <android-build@google.com> 1384315237 -0800

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