tree 94d6b17b7df696eb9e394e778bca44c9354c84ba
parent 8a196351ef7e100857e6c6d5b344d1d780584887
parent cdc7e3f4eeda205d82afbba0be5675fb7700910a
author The Android Automerger <android-build@google.com> 1369832127 -0700
committer The Android Automerger <android-build@google.com> 1369832127 -0700

merge in jb-mr2-release history after reset to jb-mr2-dev