tree b566528267c8b576a0dd6821bada96c2260abf3d
parent 04acb73b85ba711547e0fd937ca456ff8c58fd9e
parent f2fc15824dd05f5279966d44ab2681cc162cfb5c
author Marie Janssen <jamuraa@google.com> 1481758074 +0000
committer android-build-merger <android-build-merger@google.com> 1481758074 +0000

resolve merge conflicts of 7a2518e to nyc-mr1-dev-plus-aosp
am: f2fc15824d

Change-Id: I71d80c8a24f206d5919f56a28b1f1333021b7d46