tree 2baab2cc48f015a294f53a71ea60daa8c87c50e9
parent f69d40afa190a2b6938979fe10760c74a8cc55b3
parent 25bb2a3d74d6efed1870ba6907858f1bcfc7cd0a
author The Android Automerger <android-build@android.com> 1334584768 -0700
committer The Android Automerger <android-build@android.com> 1334584768 -0700

merge in jb-release history after reset to master