commit | 441fc0c9fe43daa0a88054a31efae397dce5d626 | [log] [tgz] |
---|---|---|
author | Daisuke Miyakawa <dmiyakawa@google.com> | Mon Oct 04 08:40:18 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 04 08:40:18 2010 -0700 |
tree | c7f57a471ef7a293ba101955c412b9d2376d3908 | |
parent | 3d20bc9ff602a2f81a4570d15b5e1f3cff80af29 [diff] | |
parent | e09a54e3cb4bb7b7f592832776fbf37c5cb9e1ff [diff] |
am 07fb33ef: (-s ours) am d8f1a540: Merge "Refrain warning when not appropriate. Do not merge" into gingerbread Merge commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a' * commit '07fb33efe8b0cbedf518a8afa20d96d8d4bab69a': Refrain warning when not appropriate. Do not merge