Merge changes I83981ce2,I352ca1a1 into jb-mr1-dev
authorDima Zavin <dmitriyz@google.com>
Tue, 18 Sep 2012 23:25:35 +0000 (16:25 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Sep 2012 23:25:36 +0000 (16:25 -0700)
commitd524220ccc389e317012a894fd790ec275587187
tree5c9ab4e5ec820101ad8957059be6bd07afef8849
parentd01b834b799e64ef7ce2281b700f88e666a02034
parentce73ba18eb7ba692edf7c2ddcdf2163daeccc287
Merge changes I83981ce2,I352ca1a1 into jb-mr1-dev

* changes:
  hardware: samsung_slsi: exynos5: Seperate Secure memory region
  mobicore : Added external variable for DRM library