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

* commit '0bd030b5df7381949ff368f15ebca214560fbf22':
This commit is contained in:
Qiwen Zhao 2013-12-10 18:43:40 +00:00 committed by Android Git Automerger
commit fcd08ec1ca

Diff content is not available