tree a3cf3552a5ac7e454cf01bdcd41b576214556e57
parent 6c8553dda8b7fb45adc9f48a294c130b7e283f40
parent cda00bba51c6adbf95e451fd8c6cad7a5390503a
author The Android Automerger <android-build@android.com> 1348581554 -0700
committer The Android Automerger <android-build@android.com> 1348581554 -0700

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