tree 0dc4cb0d35448728234b51703717496e235020f3
parent 77c9cf4184d2ba3b7c02c6dda7c2ece63d530233
parent 15ad1c7faae0993185f133d41b012871ae8153d5
author nagendra modadugu <ngm@google.com> 1513216545 +0000
committer android-build-merger <android-build-merger@google.com> 1513216545 +0000

resolve merge conflicts of f6187c733f349b9529006f6d1afbc42f150c2bf0 to master am: f52a9aae46
am: 15ad1c7faa

Change-Id: I2624295ad90ce418f905f21b4cc2fa4ac149cbcc