tree cf518236c3786b7e27e711e219836fdf1cf845f9
parent 350b4e9ce2844a5c3a5c1fb73e5738f0622e49e9
parent ca49f4773d273ca7ceba084aeecea9f30a13ae5f
author The Android Open Source Project <initial-contribution@android.com> 1354033462 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354033462 -0800

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

* commit 'ca49f4773d273ca7ceba084aeecea9f30a13ae5f':