Merge omap-mirror/p-jb-mr1-release into omap-mirror/d-jb-mr1-release
authorRoman Shaposhnikov <x0166637@ti.com>
Wed, 20 Mar 2013 15:57:57 +0000 (10:57 -0500)
committerRoman Shaposhnikov <x0166637@ti.com>
Wed, 20 Mar 2013 15:57:57 +0000 (10:57 -0500)
1  2 
Android.mk

diff --cc Android.mk
Simple merge