tree eb7649af15af29a3efa3515ce2fca9c2b476d0b3
parent 60c74e836fc40d65c8ac58c231956f57d26ec7eb
parent a99d077d62492f243e48a82cf96e2d52de33ee0a
author Philip P. Moltmann <moltmann@google.com> 1459883141 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1459883146 +0000

Merge "Fix package name of canon and xerox." into nyc-dev