OSDN Git Service

am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release -...
authorJean-Baptiste Queru <jbq@google.com>
Fri, 14 Jun 2013 04:07:35 +0000 (21:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Jun 2013 04:07:35 +0000 (21:07 -0700)
commit840d233c12200de9260c85d6eadbc73b41cef00b
tree2a619fa3c494ff7911f9dcefc96f2beb6df136cd
parent60db431fe44afb723654a19494b1ba0f35a735f0
parent800e4320ba0815bfe7831deab99f5d600800663f
am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '800e4320ba0815bfe7831deab99f5d600800663f':