OSDN Git Service

resolve merge conflicts of a7bb84c80d to master.
authorAlex Light <allight@google.com>
Sat, 5 Dec 2015 00:04:49 +0000 (16:04 -0800)
committerAlex Light <allight@google.com>
Sat, 5 Dec 2015 00:04:49 +0000 (16:04 -0800)
commita63518209e2e57605f3383f3048813c28a28bf1f
treea6e5d7ab6cbd089798d231a4031bbdeeacb537ce
parent2b71f69e4a7a9fb85555f47581fff09ff5866a13
parenta7bb84c80d1c8a106e9cca61c5416c1ea17f855a
resolve merge conflicts of a7bb84c80d to master.

Change-Id: I53a4bd8649ed5d249ecd3c4d064e82b58a213114
test/100-reflect2/expected.txt