am a924e71c: (-s ours) DO NOT MERGE reset to goog/klp-volantis-dev

* commit 'a924e71c93511ac0ad5456ec3a1ca7dfd35f2c79':
This commit is contained in:
Qiwen Zhao
2014-01-09 13:33:17 -08:00
committed by Android Git Automerger

Diff Content Not Available