OSDN Git Service

am f96ce7f1: am b83e3632: am f38cb998: Fix conflict with other build fix
authorMichael Jurka <mikejurka@google.com>
Mon, 5 Nov 2012 23:53:24 +0000 (15:53 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:53:24 +0000 (15:53 -0800)
* commit 'f96ce7f1591060e99dd8d6d5bdb25e162dd29706':


Trivial merge