OSDN Git Service

am f8fab173: am fb2188d1: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Aug 2013 19:19:43 +0000 (12:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Aug 2013 19:19:43 +0000 (12:19 -0700)
* commit 'f8fab17322ebc221fb493331c3a93b2d852704ae':
  "JWR66Y"


Trivial merge