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

..

java/android

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

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

jni

…

libdrm

…

mca

…

tests

…