OSDN Git Service

am 08732898: (-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:32 +0000 (08:10 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 May 2013 15:10:32 +0000 (08:10 -0700)
commit03db8767d501cbde210f0999b60577546c232f8b
tree14c292ad650b3835ffb1ed2b60ca1a6cdb67e4f7
parentf0014a6b259a10c9a79054ec3613ad510c23b3cb
parent087328986922a36bef6f1829790e0840516405a4
am 08732898: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '087328986922a36bef6f1829790e0840516405a4':