tree e95441b8a39fb756ca4e49e9a7e17188c01fdcf9
parent fb28a3a4e51542e7f52b98cb5f69522181b8b8ed
parent b1ba5ec9cf1477010fa4bd151aad80eedd8a8c0c
author The Android Open Source Project <initial-contribution@android.com> 1354579207 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354579207 -0800

am b1ba5ec9: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'b1ba5ec9cf1477010fa4bd151aad80eedd8a8c0c':
  JDP64B