tree 9cca271cdb529821f5f2e1bec1e1cc0e61a36361
parent 3bd4771ccb6f05c30cf7de6b2092f4f580821b56
parent 3e4c0d8789e394968fcc153090729110e3287069
author Philip P. Moltmann <moltmann@google.com> 1458311185 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1458311185 +0000

Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev