OSDN Git Service

am 381868f3: (-s ours) am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours...
authorJean-Baptiste Queru <jbq@google.com>
Fri, 14 Jun 2013 05:33:07 +0000 (22:33 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Jun 2013 05:33:07 +0000 (22:33 -0700)
* commit '381868f347d413a671a6ad9c0af64d258a060b99':


Trivial merge