tree 63f3ed7d63e22eee79eeefcdc1ccabe8554a0ac4
parent 6f81942f0ed4d99fa7668dbb64f22cafcb62b189
author Yaowu Xu <yaowu@google.com> 1391050987 -0800
committer Yaowu Xu <yaowu@google.com> 1391101269 -0800

Fix some automerge artifacts

Some changes in 1ca1186 were mistakenly reverted by a later merge,
this commit re-instated the chanages from values to enums.

Change-Id: Ia6b01c31da584a1f612996e6432612c1295b9eaf