OSDN Git Service

am 79c7ae40: (-s ours) am 9bc71158: am f9ad69f4: am 803b245e: (-s ours) am 469dbc0a...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:51:49 +0000 (20:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:51:49 +0000 (20:51 +0000)
* commit '79c7ae405544ce425eeeaaee855a06862dd00b71':


Trivial merge