OSDN Git Service

am eeca586b: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:09:59 +0000 (16:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Aug 2012 23:09:59 +0000 (16:09 -0700)
commit4489eba50bbf4bf03fecff227048993b41506ed7
tree9a5e5aa355a2a54c73420a83c3aacc286b510916
parentaea450e82fd8c5558e9164cbeec84916401f3d1c
parenteeca586bda0411d162307e1581e9308f5173592e
am eeca586b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'eeca586bda0411d162307e1581e9308f5173592e':