tree 513de317e9d85829106a688b28539326d64198b2
parent 5c13ade64c99d4483e088c8f3aa9bfed63ef6d64
parent a5876e43f7cc78372dad928d373b81399047a125
author Tim Kryger <tkryger@google.com> 1481849678 +0000
committer android-build-merger <android-build-merger@google.com> 1481849678 +0000

resolve merge conflicts of 48be23c to nyc-mr1-dev-plus-aosp
am: a5876e43f7

Change-Id: I16d8e6bdfa1401b534a2ac53b2fb3c2a41d0ef58