tree de62282c1f8352995919ca86caf7ae2817ab56cd
parent a7f6a4534c076ef4f84b7f08cbd507e50d71c04b
parent 3518381415d1c1fc580adbe1b398850dcd07ba2b
author Felipe Leme <felipeal@google.com> 1464038913 +0000
committer android-build-merger <android-build-merger@google.com> 1464038913 +0000

Resolve merge conflicts of 6108f5d to nyc-mr1-dev
am: 3518381415

* commit '3518381415d1c1fc580adbe1b398850dcd07ba2b':

Change-Id: I82bdb294edaced03d2a2117016668c4f65b00123