tree b4d372f81cb4f599ed7aac8c2400cad538396b7a
parent e6c0bda5dd945f3668b4108c49ee52f1a04253d6
parent 5f2edfc12c4f31a54e81c1ce538a276f61439c92
author Griff Hazen <griff@google.com> 1415114600 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415114601 +0000

Merge "Improve support for the barcode-on-screen use case for wearables." into lmp-mr1-dev