tree dacaaabe24d255ee767d17eae9348b3b1e9ca35b
parent 1b688e8039a26b7deb9217487f99136d2afcc688
parent f73abf36bcfd433a3fdd1664a77e8e531346c1b1
author Elliott Hughes <enh@google.com> 1458229246 -0700
committer Elliott Hughes <enh@google.com> 1458229246 -0700

resolve merge conflicts of f73abf3 to nyc-dev-plus-aosp

Change-Id: I9ce2fee126c70abf5129330430585fd27efd0bcc