tree 7d5d8bc80b460eec980a52e58f1f4c2820b10666
parent d01a2fb040cbc45f14fd24fb11d235e164dff92f
parent 4baf72cac7803188bcd6826458c30953aea81302
author The Android Automerger <android-build@android.com> 1333548047 -0700
committer The Android Automerger <android-build@android.com> 1333548047 -0700

merge in jb-release history after reset to master