tree 8b381950a392c78eb2651e45c53444ea9b590ebd
parent 6b3867fc6b3cb45e6163c15cc831fd150a8b104c
parent d5d68f12f524c710a42625ec17261c822bc96acd
author Qiwen Zhao <zhao@google.com> 1386698161 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386698161 +0000

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

* commit 'd5d68f12f524c710a42625ec17261c822bc96acd':