OSDN Git Service

Merge changes from topic 'am-b3b1533d8b364e7f8891eeaf56e6baab' into oc-dr1-dev-plus...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 9 Jun 2017 03:19:38 +0000 (03:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Jun 2017 03:19:40 +0000 (03:19 +0000)
commitc15368ffb644ac5f7993eb27f1f95f57f39a792b
tree658061d9402d02217f71bd5977a25b5dffaa4bd2
parent58483d21d16c80d2aca8f9d821bfe108b2cfff35
parent9cf5b43913c7e7e1814f050aa7008a2beeec688e
Merge changes from topic 'am-b3b1533d8b364e7f8891eeaf56e6baab' into oc-dr1-dev-plus-aosp

* changes:
  Merge "AudioDec Test: Ignore output port configuration" into oc-dev am: 11e9b588c4 am: 7e4b5758b7
  Merge "VideoEnc Test: extend lockYCbCr() to hal yuv formats" into oc-dev am: 452fe6aef2 am: 9c7ba7deaf
  Merge "Vts AudioDec Test: Disable EOSTest_M" into oc-dev am: a12a573955 am: 7b106b9c5a