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

* commit '47b5d67af86b1dcf73171e2ce69119f981e9649d':
This commit is contained in:
Qiwen Zhao 2013-12-10 01:58:26 +00:00 committed by Android Git Automerger
commit a58e5ed1b5

Diff Content Not Available