tree b18e0b81662c4d6b7b6c8228b5cde15c23c274ce
parent a951bd29a51836eaf1e6eb836856ea1d5d2a9ad6
parent 01996bc21961b64ef355325a9ad5c6445c734521
author TreeHugger Robot <treehugger-gerrit@google.com> 1477098325 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1477098325 +0000

Merge "Followups to ag/1553792/" into nyc-andromeda-dev