OSDN Git Service

am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge
authorJean-Baptiste Queru <jbq@google.com>
Fri, 14 Jun 2013 01:07:45 +0000 (18:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Jun 2013 01:07:45 +0000 (18:07 -0700)
commit800e4320ba0815bfe7831deab99f5d600800663f
tree2a619fa3c494ff7911f9dcefc96f2beb6df136cd
parent4b724cff027771d0d905809605b5cc50df220a4a
parent63c34b5e2aae446b76fdf34f0ff895e35cd7376a
am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '63c34b5e2aae446b76fdf34f0ff895e35cd7376a':