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

* commit 'd5d68f12f524c710a42625ec17261c822bc96acd':
This commit is contained in:
Qiwen Zhao 2013-12-10 17:56:01 +00:00 committed by Android Git Automerger
commit 11905774ec

Diff Content Not Available