commit | a7b3e66f2823c204d10e7ddf795e253e438129b8 | [log] [tgz] |
---|---|---|
author | Doug Zongker <dougz@google.com> | Mon Aug 20 15:50:18 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 20 15:50:18 2012 -0700 |
tree | ece00966e2bc7a92e9c30464c5d8b51d45e5b536 | |
parent | 07720fd5d3ab8245d8cb41dd8a47d35bc2f72d29 [diff] | |
parent | 7a4e83b235aeec6036440cb3b86311418f2e8c25 [diff] |
am 7a4e83b2: am 85e86626: Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev * commit '7a4e83b235aeec6036440cb3b86311418f2e8c25': include recovery-resource.dat in /system/etc