tree c2bab3bf43ed119cf1bcb4261b552caf6e9259d4
parent c5883f6631259f6563c28f15f1b40e4b782a7e42
parent 145b13a2db5d620eff2e15138101a7d2b652273a
author Christopher Ferris <cferris@google.com> 1501356034 +0000
committer android-build-merger <android-build-merger@google.com> 1501356034 +0000

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

Change-Id: Ic640122b90fc726373e0bd1d79eb68f1a99dc3fa