OSDN Git Service

am 7106a91c: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 May 2013 16:02:37 +0000 (09:02 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 May 2013 16:02:37 +0000 (09:02 -0700)
commit55abd78859a0482a73fe20bc6651d44c65dc72be
treeffa851fdf61b2384fcd3ddc7ef5a20e73a490ae5
parent783e35ce0066523f3adb16bb8d5d36c6e366dbfb
parent7106a91cff7bd3578eb8c07b4348c9c262f89bb8
am 7106a91c: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '7106a91cff7bd3578eb8c07b4348c9c262f89bb8':