OSDN Git Service

am 8548ddf2: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 6 Jun 2013 17:43:03 +0000 (10:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Jun 2013 17:43:03 +0000 (10:43 -0700)
commitac968945e25903af8e44e44599f0812f9d91c178
treeca296ad59aef4d44dc5a936c0ef1a8783a8ae716
parenteab49cab9fc4351af76e5c50d3d11e9c5070fd82
parent8548ddf229d1438cff6904921af84814305a4ec5
am 8548ddf2: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '8548ddf229d1438cff6904921af84814305a4ec5':
  Import translations. DO NOT MERGE