| commit | d8c323321c28a0a5ff70c6e0694aa822edca4005 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Sun Dec 05 14:46:29 2010 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sun Dec 05 14:46:29 2010 -0800 |
| tree | ea500570f98778f6d0e9ec67ef364a72319dc402 | |
| parent | bd3dd73b361ad59ae8ad0c1e7e215d974b055fdb [diff] | |
| parent | 16ec9c5bb56d3471656b216eaa6a94ddc27c7fef [diff] |
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread