| commit | 1e2f67725cd075eb9eb0751a3fa387e06d9577a6 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Aug 27 12:33:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:33:14 2015 +0000 |
| tree | f2d944491398aef081d6bf1d9816aebd8156fb2b | |
| parent | 71d4eaadd0a4a64ef0868345244cc5794fd2fe65 [diff] | |
| parent | 7b1ae055953118a83b6a2e7ee048c5701cb476c6 [diff] |
am 3403508d: am 31268de0: (-s ours) am 337cf595: Merge "Fix stuck issue on Kovio barcode" * commit '3403508db5d3451265c93abeac610d03a82721f3':