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