tree bcbc52ee128f47fb1d05e200402e60f197a33e25
parent 1991d8c2b6b85170ee1707ca19fe5c746187a77c
parent 61eec64ea9040278ff0db98c8efb27f464bc0bbb
author The Android Automerger <android-build@android.com> 1330354877 -0800
committer The Android Automerger <android-build@android.com> 1330354877 -0800

merge in jb-release history after reset to master