OSDN Git Service

am ec1b5ad8: resolved conflicts for merge of 918e1d78 to eclair
authorGrace Kloba <klobag@google.com>
Tue, 18 Aug 2009 15:45:14 +0000 (08:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Aug 2009 15:45:14 +0000 (08:45 -0700)
commit7ef26c2b082ee041cbce3b7d3512c9c5fa54f369
treebabea65c56874cbf932b18cb875ddc7e89ea28a7
parent09a2198164f0fc081c0355cd35c91cf8d72658c3
parentec1b5ad8d8283b1fbbc5d7fa1cd50ef95b9e594d
am ec1b5ad8: resolved conflicts for merge of 918e1d78 to eclair

Merge commit 'ec1b5ad8d8283b1fbbc5d7fa1cd50ef95b9e594d'

* commit 'ec1b5ad8d8283b1fbbc5d7fa1cd50ef95b9e594d':
  Fix http://b/issue?id=2052775. According to the comment, we try to call