tree cfcd957546a9c91fc2e9519480a7caca0cb40d48
parent 140295d8700f8888a58199e14431e50236952c7c
parent 89dc24898cdac4b6a3a93520b4bf72118460d561
author TreeHugger Robot <treehugger-gerrit@google.com> 1491618995 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1491618996 +0000

Merge "Fix bitmask arithmetic to match up with decoding."