OSDN Git Service

am 4c89ec75: am 1b02bf12: (-s ours) DO NOT MERGE Fix build break by not redefining...
authorStephen Hines <srhines@google.com>
Tue, 13 Aug 2013 04:51:33 +0000 (21:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 Aug 2013 04:51:33 +0000 (21:51 -0700)
commitd1b3e27b8028ee1afcc3b34e8d7b7990849131bd
tree192b515b8752f148a390173276af692fa80c135b
parent3984ba7795f511b88bb990f1adb552ea5f4097ce
parent4c89ec75151c28a905602b79f125583eba6edcd5
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.