OSDN Git Service

Merge "Remove old software avc encoder" am: fb20749bfa am: b808809b5f
authorMarco Nelissen <marcone@google.com>
Fri, 17 Mar 2017 17:26:21 +0000 (17:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Mar 2017 17:26:21 +0000 (17:26 +0000)
commit98d51861b0e72039cdedc589301979c17083f650
treec74a6237d5347a768101ad4947fa8cd89e7fe88c
parent52d0204d8fb9c293e4db67ed10b0491f006b5fbe
parent3b21344aee0579e8d917e32a22e9f771e82ef36d
Merge "Remove old software avc encoder" am: fb20749bfa am: b808809b5f
am: 3b21344aee  -s ours

Change-Id: I1092933a14330e1d248ae5b7927ddd7e63768659