tree ec25556c025afd966e155f67de4752abb7ad477a
parent df2dae01b065ef18b7de7f76b29a9857bf70f443
author Matthew Williams <mjwilliams@google.com> 1374868599 -0700
committer Matthew Williams <mjwilliams@google.com> 1379370221 -0700

Pending op fix didn't merge properly from KLP-dev.

Manually merge in Cl c/342668. Add another test to ensure that it
WAI.

Change-Id: Iae603328d525cc71e4e31ad30a13384efc50f823