Marco Nelissen 665b07579a am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev ...

* commit '81fbdade8db4117157ea48602be121e6cf5597dd':
  Verify certificates

2014-03-20 10:47:34 -07:00

..

drm/mobile1

…

media

am 81fbdade: resolved conflicts for merge of 534f3e94 to jb-mr1-dev

2014-03-20 10:47:34 -07:00

mtp

am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"

2012-09-18 11:01:32 -07:00