OSDN Git Service

am 34949064: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:07:04 +0000 (08:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 May 2013 15:07:04 +0000 (08:07 -0700)
* commit '349490646f72d63eb88fcb806a96248b4146d319':
  "JWR59"
  JWR58C
  JWR58B


Trivial merge