diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-03-17 17:15:47 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-03-18 09:29:29 -0700 |
| commit | 83b65486beffc7c86f24c428fbb7b50bbbe189f9 (patch) | |
| tree | ab343e30dd96348d35b0957453fbf6b7b0bac56d /libmincrypt/NOTICE | |
| parent | 4a4c9f6f98055918f1ebff06b3cc1ed622c058fe (diff) | |
| parent | e037fd7e193ecccbb5c0888e49f6d58c224bc11d (diff) | |
| download | system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.gz system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.tar.bz2 system_core-83b65486beffc7c86f24c428fbb7b50bbbe189f9.zip | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
init/devices.c
libpixelflinger/Android.mk
Diffstat (limited to 'libmincrypt/NOTICE')
0 files changed, 0 insertions, 0 deletions