tree 55f9c3d43824090cf34a5bf2b1d37ea561b68286
parent 24a325d6f8c4bbf9330e6ce0c769d46e04266ffc
parent e2976465ef00aa6aeee94fc845a487c95b47a304
author Qiwen Zhao <zhao@google.com> 1386640721 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386640721 +0000

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

* commit 'e2976465ef00aa6aeee94fc845a487c95b47a304':