tree e19cd2ba82e9bf6111e2514e8ebf0d2f0bd3399a
parent a6b4b2179433d7293c050db5de07f1af81584301
parent 4acdde9ef027bf91c8b5c48852f12480ed774b0d
author Felipe Leme <felipeal@google.com> 1469806479 -0700
committer Felipe Leme <felipeal@google.com> 1469808760 +0000

resolve merge conflicts of 4acdde9 to nyc-mr1-dev-plus-aosp

Change-Id: I2ed3041dd979368f149b6fccc84621e56c118db8