tree fcbf225f64d7971ee7a09a34e805e611f26699e8
parent 6e94b2cbc4e6bb1e9e2254e6a8d25cb5631d699b
parent 7d58fc6e8875ccc3dbbb34bcd379a0f9c9ee481e
author The Android Automerger <android-build@google.com> 1379354793 -0700
committer The Android Automerger <android-build@google.com> 1379354793 -0700

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