tree effbd1f65dd6ed311057405d2c1155678944467a
parent 41943dd027740873180bea8d30b65d71f0077654
parent 9c0a80b8f48ba3a183afff5820f4ffad29b31224
author Stephen Hines <srhines@google.com> 1409868547 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409868547 +0000

am 9c0a80b8: Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev

* commit '9c0a80b8f48ba3a183afff5820f4ffad29b31224':
  Fix undefined behavior (not returning a value from a function with return).