Merge "Fix warning: overriding commands for target"
authorDmitriy Ivanov <dimitry@google.com>
Wed, 3 Dec 2014 18:55:55 +0000 (18:55 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 3 Dec 2014 18:55:56 +0000 (18:55 +0000)

Trivial merge