commit | 29d9849fd7b8b49c26fe7e7bae0ba01e907dc1b7 | [log] [tgz] |
---|---|---|
author | Nick Pelly <npelly@google.com> | Tue Oct 19 09:56:01 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 19 09:56:01 2010 -0700 |
tree | d56b0a99432fedb2f3f3a36a6c90588edff46a78 | |
parent | 18286cc60111db8fd3574f3df1d9db0920cb918c [diff] | |
parent | 7dced8de3813aa42edb59e13e3ea3a2657d06125 [diff] |
am 7dced8de: am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread Merge commit '7dced8de3813aa42edb59e13e3ea3a2657d06125' * commit '7dced8de3813aa42edb59e13e3ea3a2657d06125': NFC: broadcast intent constants for adapter state change