| commit | 16ec9c5bb56d3471656b216eaa6a94ddc27c7fef | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Sun Dec 05 14:42:45 2010 -0800 |
| committer | Nick Pelly <npelly@google.com> | Sun Dec 05 14:45:29 2010 -0800 |
| tree | 2e6a90d2e4ac3f1182f6ff96487f9645eb9aba28 | |
| parent | 4567847d461afac08a80518637a0e48eff3c5247 [diff] | |
| parent | 67a337bc51b9a7ecc09a779fb48a9a215bf5d0ed [diff] |
Merge branch gingerbread-nfc into gingerbread. Change-Id: I37d657a16061fddfbb0993463f24d6d3945cddd1 Signed-off-by: Nick Pelly <npelly@google.com>