tree 981d6ab8bcbd60e7a4df7405de2fba07708625e2
parent 0d26cef64debfaa6862a27587c1fd0d30baa3b1d
parent b6722b50b81eccebfc299bfd81f7dc687b1f9bcb
author The Android Automerger <android-build@android.com> 1336173212 -0700
committer The Android Automerger <android-build@android.com> 1336173212 -0700

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