| commit | d1b3e27b8028ee1afcc3b34e8d7b7990849131bd | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Mon Aug 12 21:51:33 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 12 21:51:33 2013 -0700 |
| tree | 192b515b8752f148a390173276af692fa80c135b | |
| parent | 3984ba7795f511b88bb990f1adb552ea5f4097ce [diff] | |
| parent | 4c89ec75151c28a905602b79f125583eba6edcd5 [diff] |
am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES. * commit '4c89ec75151c28a905602b79f125583eba6edcd5': DO NOT MERGE Fix build break by not redefining LOCAL_SHARED_LIBRARIES.