tree 33e98ac517ee16f4ec66c4a05fb7abf249a3cc52
parent c301186b49201c8ebf1dc05b336ba0a5e3877408
parent d0c74bc9dc0ac2fc9d9c29c336694ec9733127c9
author The Android Automerger <android-build@android.com> 1364820956 -0700
committer The Android Automerger <android-build@android.com> 1364820956 -0700

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