ref: 2dc92482d060ba57926301d9e74dff962e412d7e
parent: 4fffefe189a9123d4b04482c26a1be5eb632b397
parent: 4f95a7fe3ef8e786dbb6c9c1dc3240da24538f92
author: Yaowu Xu <yaowu@google.com>
date: Wed Apr 9 10:29:23 EDT 2014
Merge "Fix the setting of mode_skip_mask"