Commit 48966963 authored May 30, 2013 by The Android Open Source Project Committed by Android Git Automerger May 30, 2013

am 041fd816: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '041fd816':
  "JWR60"
  JWR59C
  JWR59B

There are no changes