tree 71699c7e54d90a119df4039851804ffc096bf570
parent a6687f66cc4725b1b0256c87f7c347a47f3d9565
parent 098ae7953fd9e9c37dccdd02fdf8b5a8e02eb666
author Torne (Richard Coles) <torne@google.com> 1446137273 +0000
committer android-build-merger <android-build-merger@google.com> 1446137273 +0000

am 99c3fbb3: Update M40 glue layer from master.
am: 098ae7953f

* commit '098ae7953fd9e9c37dccdd02fdf8b5a8e02eb666':