tree b88c6115147083b544f1493f5ae04c7fbf314ab1
parent c8698cb92ef83e96b3c7776be9b47d174095bc15
parent 775d3a0a705b435a453f2a82ed940f5e650136ad
author The Android Automerger <android-build@android.com> 1345642477 -0700
committer The Android Automerger <android-build@android.com> 1345642477 -0700

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