OSDN Git Service

am a4a4e0b3: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 29 May 2013 15:10:33 +0000 (08:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 May 2013 15:10:33 +0000 (08:10 -0700)
commit849c8173361ce83bf27aa4a77625ad6a04fb7540
tree8fe518e778f27d12e62a4d88d6dd1f974850ee18
parent4c3166e7b89c179ab028d705f537f0768ebfdeda
parent82ebc35ff9cd21ee77f1d2fc5a1044629242820c
am a4a4e0b3: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'a4a4e0b3cb74f6cea857ed2c8a4315e1ffc30bac':