OSDN Git Service

am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Fri, 14 Jun 2013 05:31:29 +0000 (22:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Jun 2013 05:31:29 +0000 (22:31 -0700)
commit381868f347d413a671a6ad9c0af64d258a060b99
tree3f5e3e579e1bfa61463938a0ac6014e853f4c9bf
parent33b5dfb684910c5dbcd0e58f24a90ead01078629
parent840d233c12200de9260c85d6eadbc73b41cef00b
am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '840d233c12200de9260c85d6eadbc73b41cef00b':