tree 43d8519b92112f2a8810dc779a53ff0c26e6ff38
parent 23b6d46e7b1df20c654baebb323f4a35122714db
parent 6488d4e87d62ee0f5661d0dd0def22d9fb2de21a
author Christopher Ferris <cferris@google.com> 1501355733 +0000
committer android-build-merger <android-build-merger@google.com> 1501355733 +0000

Merge "Changes to support new v4.12.3 headers." am: ab9e842013 am: 4e99fac316
am: 6488d4e87d

Change-Id: I7c1ee59b3eda16790b3441654766ebe08f01406e