OSDN Git Service

am ca44dc79: am 8d6d8f54: Merge "Add libcrypto for users of libstagefright."
authorChristopher Ferris <cferris@google.com>
Wed, 11 Jun 2014 20:49:48 +0000 (20:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 11 Jun 2014 20:49:48 +0000 (20:49 +0000)
* commit 'ca44dc79b5a163030ab0963f80aa771871de092d':
  Add libcrypto for users of libstagefright.

1  2 
media/libmediaplayerservice/Android.mk
media/libstagefright/rtsp/Android.mk

Simple merge