Merge branch 'android-4.9' into amlogic-4.9-dev
authorVictor Wan <victor.wan@amlogic.com>
Thu, 18 May 2017 06:52:37 +0000 (14:52 +0800)
committerVictor Wan <victor.wan@amlogic.com>
Thu, 18 May 2017 06:52:37 +0000 (14:52 +0800)
1  2 
Makefile

diff --cc Makefile
Simple merge