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)
commit0de0584cf550f7fb4016c9ef53a6604529248420
tree8fe518e778f27d12e62a4d88d6dd1f974850ee18
parentcc51ad350e93c51f24a4aca8eb31051b753b52c6
parenta4a4e0b3cb74f6cea857ed2c8a4315e1ffc30bac
am a4a4e0b3: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'a4a4e0b3cb74f6cea857ed2c8a4315e1ffc30bac':