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

* commit '0afedc0682bed5ebba01a3e35d8944a77b239733':
This commit is contained in:
Qiwen Zhao
2014-01-09 21:36:49 +00:00
committed by Android Git Automerger

Diff Content Not Available