commit | 9d49568900d31d4572440f575f82950adc1799b4 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Thu Aug 06 18:07:42 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 06 18:07:42 2015 +0000 |
tree | 240b53881bcc382f214a9b11bf1492cc0ad5e3bf | |
parent | 1c79b73b693124985ae2ce51a58b9235481c0773 [diff] | |
parent | 7c6a2a4ccf30ce74a5acddec406fdf4243da1e50 [diff] |
am 7c6a2a4c: resolved conflicts for merge of 610520ad to mnc-dr-dev-plus-aosp * commit '7c6a2a4ccf30ce74a5acddec406fdf4243da1e50': build: Support packaging for system_root_image.