tree c61a6923bd3c2ae6d4575402005ebdd62a6dcea7
parent 5cc5f2d70eaa51ad2c7577e923e2350ed5642d4a
parent 79ec6df771b0c05609a611a939f08fcd51f45b74
author Hyunyoung Song <hyunyoungs@google.com> 1462394588 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1462394590 +0000

Merge "Add shortcut manager support to Settings (2/2) b/28298258" into nyc-mr1-dev