tree d3389cbe84c26077cccfd63a6060937d7a84f2e7
parent 462324b655083efb96765b02cf1a0708cf9c079e
parent 9eaffca358403b96215a5def0df7f71c3e11f907
author Alex Deymo <deymo@google.com> 1471029827 +0000
committer android-build-merger <android-build-merger@google.com> 1471029827 +0000

resolve merge conflicts of 66940b9 to nyc-mr1-dev-plus-aosp
am: 9eaffca358

Change-Id: I10332a4634111b6a3cd39ef65e9b0d9392f95d64