tree 346339cfd17c9b8880459fb94fd168e76045a938
parent 9ae20e176ae8c385f952443037dc7b48777b5600
parent 674c91d7123b0042f3fb76525fcc1e4234eae378
author Xin Li <delphij@google.com> 1510010562 +0000
committer android-build-merger <android-build-merger@google.com> 1510010562 +0000

resolve merge conflicts of 8f07b779f6 to oc-mr1-dev-plus-aosp
am: 674c91d712

Change-Id: Ib7d13d03044cb94d7c9b3f2095451b3551c36fea