tree 7a00ca2f24938d885e263a77b5e06cfe4baa2c38
parent 2d1664875abba3670d7ca0339f260dc69cd007e4
parent 337cf59590a80d6763226e29240ee7aeb7f556f6
author Martijn Coenen <maco@google.com> 1440150957 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440150957 +0000

am 337cf595: Merge "Fix stuck issue on Kovio barcode"

* commit '337cf59590a80d6763226e29240ee7aeb7f556f6':
  Fix stuck issue on Kovio barcode