tree 5476590590978c9b54e2286d2071b218d73d7ebd
parent 171eee1ff5730e54411e17b9ca702a01ac561523
parent 2709be1ecb0062e301dc2d3ea9eef11951a5b958
author Glen Kuhne <kuh@google.com> 1470859785 +0000
committer android-build-merger <android-build-merger@google.com> 1470859785 +0000

resolve merge conflicts of b843fca to nyc-dev
am: 2709be1ecb

Change-Id: I194ca0310e928e2e8134e14a4950b3cfab705d8a