| commit | a898c52b6414ca76a137955d9e427fa280863eff | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@google.com> | Tue Mar 18 20:52:43 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 18 20:52:43 2014 +0000 |
| tree | 9d5e1d1ab6b7355e154f893bdafe7de0aed6da3b | |
| parent | 7425d035ef70a831a6b8b0d85718244195d69aef [diff] | |
| parent | b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a [diff] |
am b4bbf887: resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp * commit 'b4bbf8878c3a6b2a17a3a96f1a23300748dbd81a': add --shutdown_after option to recovery