| commit | 2c36aa94a243de40907019b80dc873346f7d6b86 | [log] [tgz] |
|---|---|---|
| author | Steve Kondik <shade@chemlab.org> | Fri Nov 25 14:53:00 2011 -0800 |
| committer | Steve Kondik <shade@chemlab.org> | Fri Nov 25 14:53:00 2011 -0800 |
| tree | 2dd00bd4fb42c47e7fde5258459b160f1ccac203 | |
| parent | f57594030e578089ecf52e29559f0703b1a8ea6b [diff] | |
| parent | 5ed116fa49d0cda0815bc912843059d6299564d8 [diff] |
Merge branch 'master' of git://github.com/CyanogenMod/android_external_dropbear into HEAD Conflicts: Android.mk Change-Id: I19b14f6ad3bf19fe8b471244512c09e4580e9835