tree de0b1a62da668b4215fd9ad5d2e3fec71f971a7e
parent 5b1296201befe423c64e9f1691e4e526fff41421
parent 8781a2aa9b4a1820cbcca91659e68768ba9415af
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1522257959 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1522257959 +0000

[automerger] Decoder: Modify setting short term reference field flag am: 47cc04b40c am: 1991ec77e7 am: c18d0ab03a am: 8f05a87c39 am: ce46d15877 am: 8781a2aa9b

Change-Id: Iee68471f672970bf11e1066da18be4208d87c595