tree 6deb0f73301dde2c9db62c6f7d8b4b1a5dedae21
parent 9abee8d22d8fc43326e6cede8cc8bf6fc2858670
parent 821d5d2397568b28b40c911c6a57399ea52890b4
author Tao Bao <tbao@google.com> 1479280564 +0000
committer android-build-merger <android-build-merger@google.com> 1479280564 +0000

resolve merge conflicts of d5d34d7 to stage-aosp-master am: 03eb766a56 am: 7f0a56dbf1
am: 821d5d2397

Change-Id: Iba601cb5be9f10ceea003e620c7b319da3f04788