| commit | 72935566aaad6be6547d38f9cd22fb7a0c25b757 | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Jul 08 18:14:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 18:14:10 2015 +0000 |
| tree | 1ee78c793930b0362e313aa3443a6d041d149295 | |
| parent | b8fbf8a2a1e153ec79a57c54b2bd1984e003cd47 [diff] | |
| parent | 38a534b6939630039d0c78c2f9f20dd8fde64c85 [diff] |
am 38a534b6: resolved conflicts for merge of 610754e5 to cw-e-dev * commit '38a534b6939630039d0c78c2f9f20dd8fde64c85': Scan all init.*.rc files for flash_recovery service.