tree 10daf47dc02069323a02d8408a2357db00198834
parent 72f1e3b9c9992bfc3449c5441bc8e50e7b05f083
parent 24c1d664c4f95a8c997bfc4683844e05b788c3db
author Jeff Brown <jeffbrown@google.com> 1415912299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415912299 +0000

am 24c1d664: Merge "Remove an unnecessary condition from previous change." into lmp-sprout-dev

* commit '24c1d664c4f95a8c997bfc4683844e05b788c3db':
  Remove an unnecessary condition from previous change.