tree 70d8f9ef39181780579ad0109f0bb71bcae70675
parent 5d6b47c1a21bd3d283f95aae4671b3667f511515
parent d570e9839ec27d3315f8a8f6b81308531fd7a047
author Jason Monk <jmonk@google.com> 1415379517 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415379517 +0000

Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev