OSDN Git Service

am f66a269f: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release jb-mr2...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Aug 2013 13:36:54 +0000 (06:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Aug 2013 13:36:54 +0000 (06:36 -0700)
* commit 'f66a269fa4300fa691348bdd55a2a16ff55de608':
  JWR66W
  JSS15O
  JLS36
  JSS15N
  "JSS15M"
  "JSS15L"
  "JSS15K"


Trivial merge