tree 02028edfcd1734cd8c2195d565bf8cf81668d302
parent 6ac5db29db06b3e46874757c24736350b3663d12
parent 3e003ceeda52baebbc216b6e812c4c85e0163bbd
author Elliott Hughes <enh@google.com> 1484010502 +0000
committer android-build-merger <android-build-merger@google.com> 1484010502 +0000

Merge "Address review comment." am: 77ec0071cf
am: 3e003ceeda

Change-Id: I3f984543d2724c26f8720a4eaeea177b94cf0068