OSDN Git Service

am 9c2e42a2: am 009b0502: am 63e1a5a9: am 4c13ac43: am 73d8e5d2: (-s ours) am 63da0db...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:13:31 +0000 (20:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:13:31 +0000 (20:13 +0000)
* commit '9c2e42a2ed84f668bd759190481c5144421f1fd8':


Trivial merge