OSDN Git Service

am b83e3632: am f38cb998: Fix conflict with other build fix
authorMichael Jurka <mikejurka@google.com>
Mon, 5 Nov 2012 23:49:53 +0000 (15:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:49:53 +0000 (15:49 -0800)
commitf96ce7f1591060e99dd8d6d5bdb25e162dd29706
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent4554d9f5196a2b39fdb31b944611f2b2d0d9fb37
parentb83e3632acf59c2e790f6d22f7830891db44852b
am b83e3632: am f38cb998: Fix conflict with other build fix

* commit 'b83e3632acf59c2e790f6d22f7830891db44852b':