tree c58eec4e23d2a9cd17892817d9ce6a8b759dbbf9
parent 484a77bc26fa8d890d06140ec992144d78b44324
parent 276ba655d67d883ff0c71059e6896cbeaa4a45fe
author Christopher Ferris <cferris@google.com> 1501356037 +0000
committer android-build-merger <android-build-merger@google.com> 1501356037 +0000

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

Change-Id: I22ac5ebe1b2dd855676a60ed314d9613668f6a8f