tree e510bdd5a41da1f44991e9a8100203fc7db10e10
parent 424df443c6d1252c858d90e6e3a73914e81e4d14
parent 17a888d26488d25eb88d351f5527e0a332752721
author The Android Automerger <android-build@android.com> 1340313658 -0700
committer The Android Automerger <android-build@android.com> 1340313658 -0700

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