OSDN Git Service

Merge changes from topic 'highlight_fixed' into oc-dev
authorJiaquan He <hejq@google.com>
Sat, 27 May 2017 00:20:56 +0000 (00:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 27 May 2017 00:20:56 +0000 (00:20 +0000)
commit778523ca5c73b1d2dff862ea5004f193038533a1
treeaa6260e0ee9c2002317233e6e310c379e63aaa60
parent74282f0745eb9f8e2d8d588a000e9ad389fefaf0
parent759669988bfcbbbcf5e47e1399ae47602d158c3e
Merge changes from topic 'highlight_fixed' into oc-dev
am: 759669988b

Change-Id: I1856f049fbb1f76e728f881c088579309b81a57c