tree 88d16b49620404e37e267d79799534641e6f1010
parent 77c19899fb2edfa0e67f99f1355a2965fae61ed3
parent 130f6c86f590b61bc3aef7883500eb4c0ba593c3
author Elliott Hughes <enh@google.com> 1474921309 +0000
committer android-build-merger <android-build-merger@google.com> 1474921309 +0000

resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp
am: 130f6c86f5

Change-Id: I78fc8627c3fc3701f1a34ae1038d96a7df2e6e18