tree c58eec4e23d2a9cd17892817d9ce6a8b759dbbf9
parent 484a77bc26fa8d890d06140ec992144d78b44324
parent 50139f3d2f12021038df9ea29c2610bf1394eab2
author Christopher Ferris <cferris@google.com> 1501356367 +0000
committer android-build-merger <android-build-merger@google.com> 1501356367 +0000

Changes to support new v4.12.3 headers. am: 0395510ea0 am: 76e6a53182 am: a17fae3c45 am: 276ba655d6
am: 50139f3d2f

Change-Id: Ief0a698a34a3ca86bff26b313b575030cfe214c4