tree 02028edfcd1734cd8c2195d565bf8cf81668d302
parent f6d4b1ec09c2ed471f520c625dced5e0b1b19fd8
parent ac431948d3d3bc672ecd25e50bade26ac224ef9e
author Elliott Hughes <enh@google.com> 1484010801 +0000
committer android-build-merger <android-build-merger@google.com> 1484010801 +0000

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

Change-Id: Ide8ad96300b13f8cc32717c61fdddfebbf2dd04e