tree e03bbe14f5568110c62c59c6ce0482e9d17dda0b
parent c027c8dba8be1f7e07a1052dda85813a92c91a33
parent 2f31f105e6f566ddb17552bd25a9f2d02e1f0d5c
author Android Build Merger (Role) <android-build-merger@google.com> 1480651219 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1480651235 +0000

Merge "Merge "Get the correct operator name" am: 297e9f9a32 am: 2232ac8c59 am: 18a0e81a06" into nyc-mr2-dev-plus-aosp