tree c7c697dcd5ef8465285f74dd49c7c6905a1e0f61
parent 0e468faad559bb2edc7b0646943e54e84d9de312
parent ce761d1fef4da2a4dec3eb538d103fcde1971dba
author Christopher Wiley <wiley@google.com> 1455655298 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1455655298 +0000

Merge "resolve merge conflicts of c25621f0e5 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp