tree f1c42e711c86009f867207894a11a596f70e8095
parent 02d29216c92272fe2c3839a835c5a2c1ea6268f2
parent c9b993620b5648dac65804cb6a314aad1d58432d
author The Android Open Source Project <initial-contribution@android.com> 1355326583 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355326583 -0800

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

* commit 'c9b993620b5648dac65804cb6a314aad1d58432d':
  JDP72B
  JDP72