OSDN Git Service

Merge branch ab9bfb48e9c9aa0d4d0e182a8b7f78f8cae27e42 into android/master
authorbuildslave <sys_buildbot@intel.com>
Wed, 22 Jul 2015 13:00:13 +0000 (13:00 +0000)
committerbuildslave <sys_buildbot@intel.com>
Wed, 22 Jul 2015 13:00:13 +0000 (13:00 +0000)
Change-Id: I7055293535066136428f3479c6160b8341ef24c3
Tracked-On: https://jira01.devtools.intel.com/browse/CACTUS-3235

1  2 
control.c
enumeration.c

diff --cc control.c
Simple merge
diff --cc enumeration.c
Simple merge