tree b7011278d461ad0e09cb96fe4cc055e0423dbf52
parent 61bb11cfa03abc345f27ec14f63929b6f600edff
parent e99adc70c8e0a64cb8d13a2ec4c125adaf18904d
author Michael Jurka <mikejurka@google.com> 1313117355 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1313117355 -0700

Merge "On device startup, be in touch mode"