tree a3baf8034d18e5caf285959f1daf918dd7c096c9
parent 2eb715d8668c3e5af6095d54341577619a14b1d1
parent 78b285b36746fcdcd1525a8da8e73cc39829e53d
author Colin Cross <ccross@android.com> 1487909269 +0000
committer android-build-merger <android-build-merger@google.com> 1487909269 +0000

Merge "Fix multiton issue"
am: 78b285b367

Change-Id: I56c87e6d4d8b5f5364d2c37c95cf0097d6071985