commit | 5a957fc91afb6cfe27b3ec8cad5fa4da0cbe0ef8 | [log] [tgz] |
---|---|---|
author | Marc Blank <mblank@google.com> | Wed Apr 28 10:03:04 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 28 10:03:04 2010 -0700 |
tree | 1f5cd7388b54065477fa0a093bbba79b8b0a659d | |
parent | 7aa9e1e0ac2678d86bf1f7276c0e0588c1c2f1fd [diff] | |
parent | 7e8315c018edd545cc7ed1ef560a03e623a71a5d [diff] |
am 7e8315c0: am b7f57f25: Remove STOPSHIP debug code Merge commit '7e8315c018edd545cc7ed1ef560a03e623a71a5d' into kraken * commit '7e8315c018edd545cc7ed1ef560a03e623a71a5d': Remove STOPSHIP debug code