tree 2dfba028bd1e61c682ec66b9d2547d3f12c4c35f
parent 61728ff4d8281376045e2c21f354a335e9430777
parent 77ec0071cf41b221e44ac390adc8fccbd6463666
author Elliott Hughes <enh@google.com> 1484010201 +0000
committer android-build-merger <android-build-merger@google.com> 1484010201 +0000

Merge "Address review comment."
am: 77ec0071cf

Change-Id: I0b40813d4c40e104ee111c45e13d6f278e6d705c