tree 253f9f7f1562a52bb66785eaf1d13b6ef3fcac49
parent 645e1d7ec0289b3ab827ee6ce39b80a615f6ebc7
parent a62c2d36e9013501784b7044511ae4484642d610
author Mitchell Wills <mwills@google.com> 1470783927 +0000
committer android-build-merger <android-build-merger@google.com> 1470783927 +0000

resolve merge conflicts of d81fcbc to nyc-mr1-dev-plus-aosp
am: a62c2d36e9

Change-Id: I0e6e8ccfa01489d1339e98bbc45c619405a33625