| commit | 7b1ae055953118a83b6a2e7ee048c5701cb476c6 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Aug 27 05:06:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:06:58 2015 +0000 |
| tree | 22dc10591cb6755667e8afd4c0f440f2d2e4533f | |
| parent | 084bb132ef4c693de28aa321e427e02de735e55d [diff] | |
| parent | 4a00aa3c73eae38e318d9875936cec05b612e8f9 [diff] |
am 31268de0: (-s ours) am 337cf595: Merge "Fix stuck issue on Kovio barcode" * commit '31268de080326682c57c7b6d658a0ceeeca4ddc7':