commit | ebf75d8b210e588ba965693d0bc4720005f37788 | [log] [tgz] |
---|---|---|
author | Kenny Root <kroot@google.com> | Tue Sep 16 19:57:02 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 19:57:02 2014 +0000 |
tree | 2b51c5989997c9e72efa3811df41d118e4381e1d | |
parent | f9252d49cd20f48709f3deaec5f6db2a40f4a9a8 [diff] | |
parent | 2173582b5ab0bdda79c2f4ba784fe2fe12eaa7eb [diff] |
am 2173582b: resolved conflicts for merge of d9714d34 to lmp-dev-plus-aosp * commit '2173582b5ab0bdda79c2f4ba784fe2fe12eaa7eb': adb: fix 64-bit build add sideload-host mode to adb