tree 882da7e2f63b38d5f3b32ec1a16f816b538b73d4
parent 86088459c95d2115ef5352fee05074f2e9c5f5c1
parent 6d79833423d0254f0523dce3e63c7e65ccf89a7b
author The Android Automerger <android-build@android.com> 1330959550 -0800
committer The Android Automerger <android-build@android.com> 1330959550 -0800

merge in jb-release history after reset to master