tree 661fab4fcaa609e030117dc3bbbb74215badbb81
parent 6cae189d2667f050a8c2565b9a71b540c6e7dfe9
parent 794bcd27ef0abffd01255dd11991e1bcacc954d7
author Daniel Sandler <dsandler@android.com> 1496789580 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1496789587 +0000

Merge "resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus-aosp