OSDN Git Service

am bf13b892: am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from...
authorJean-Baptiste Queru <jbq@google.com>
Tue, 26 Feb 2013 22:43:15 +0000 (22:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 26 Feb 2013 22:43:15 +0000 (22:43 +0000)
commite45c235068ab3024814f1f724ca01d1178b4cf1b
tree590bf4847182088bf863936bcb837eabc77268ad
parente3d336f5499b7b15fa2b95ddf47d05266ea22518
parentbf13b8923b7fad0d37b2dcccf2d4dc6b0d4ffff4
am bf13b892: am 8a0dc8e1: am ee98d0ed: (-s ours) am 53ed93f3: (-s ours) Merge from jb-mr1-dev - do not merge

* commit 'bf13b8923b7fad0d37b2dcccf2d4dc6b0d4ffff4':