| commit | 3e9b20e4309edb0162d120aecf6a4021c8d1b2d6 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Feb 04 19:33:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 04 19:33:14 2015 +0000 |
| tree | 97efd388085a44b8e07d0ad41859e1dca33a0e2f | |
| parent | f65bde3e7819b88f6c52613c48db274a5b7f67bd [diff] | |
| parent | 16ba2ed82bc084d5355477a381cc0bcc8b60a7bd [diff] |
am 16ba2ed8: resolved conflicts for merge of 4c178ebc to lmp-mr1-dev-plus-aosp * commit '16ba2ed82bc084d5355477a381cc0bcc8b60a7bd': Remove support of factory ramdisk/bundle.