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

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

Diff Content Not Available