tree ff985d706e8f40dc61927e26e0e06585d5573069
parent 4999606cfecb2d50230f3d2e09a1c11effcac49f
parent 8fdce9ab9987ab0fd751f266fd008d2e80c96720
author Tao Bao <tbao@google.com> 1490750091 +0000
committer android-build-merger <android-build-merger@google.com> 1490750091 +0000

resolve merge conflicts of 39ef2d7f to oc-dev-plus-aosp
am: 8fdce9ab99

Change-Id: Ifcd2c3236d337216adabb5bb810befd33f05f44c