tree d68d14c78f4d1896a5d2fd5b62cfe19ad4dc888d
parent fb52b3700cf1d4e5b28206134ea651301c67bda3
parent ba33854fbce0f1fe262c76915c36a4a7bc01f3d6
author Andreas Gampe <agampe@google.com> 1484091739 +0000
committer android-build-merger <android-build-merger@google.com> 1484091739 +0000

Merge "resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
am: ba33854fbc

Change-Id: I109dedc6bec6847b81a2a88b698938910a2715bf