tree cce154869fe2336a28fad19f30c5e83f107aa3d9
parent 31e5f3b30ccf4102880cd8ab2c143ed5b5bfb5fb
parent eb754fc01b4e1f1a664ddbe375d56f624a053d19
author The Android Open Source Project <initial-contribution@android.com> 1354033615 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354033615 -0800

am eb754fc0: (-s ours) am ca49f477: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit 'eb754fc01b4e1f1a664ddbe375d56f624a053d19':