| commit | e09fbdf13f1170bc51ee51538c339973762f61ec | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Thu Dec 05 21:29:47 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 05 21:29:47 2013 +0000 |
| tree | 8a902919d001d7eb75f0ddb70cac30bac361fd32 | |
| parent | d1c056e13f28362aa9ba996e102443cd96934cf5 [diff] | |
| parent | d1b3e27b8028ee1afcc3b34e8d7b7990849131bd [diff] |
am d1b3e27b: (-s ours) am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES. * commit 'd1b3e27b8028ee1afcc3b34e8d7b7990849131bd':