tree 73a4607c92d00c87f9c6e059957e8180046afc68
parent 536a7b24a36033de9b4a8331317ce120d988978f
parent e57594a6934a912ab7b1bd0b8bdaff187ae25ca3
author The Android Open Source Project <initial-contribution@android.com> 1355956535 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355956535 -0800

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

* commit 'e57594a6934a912ab7b1bd0b8bdaff187ae25ca3':
  JDP80B