| commit | 54c9d4a79aa4c01034f8c41f948f0ed546459e89 | [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 | 6802121560416ba7ade8d4dd32269fca453234dc | |
| parent | 10484ac22aa4b2d9807abb9e706163d1381fd3f2 [diff] | |
| parent | 130f48f5bcdd173d82be69f5deac3588b5055fbd [diff] |
Merge "Merge branch gingerbread-nfc into gingerbread." into gingerbread