tree fde06f01c6f1ab548bc0466a6d63ba9f78b449b9
parent 1ae5d8cc31b5378f5e0db3eb0332524ca608d441
parent 530260ea5d7eba867eea989f00e6031c79ff90ff
author Stephen Hines <srhines@google.com> 1472663969 +0000
committer android-build-merger <android-build-merger@google.com> 1472663969 +0000

Merge "Revert "Fix decodes on 64-bit devices built with clang-3.8"" am: 9952695a90
am: 530260ea5d

Change-Id: I241dd2de95483dc350a35215f803f24edf37565e