tree 71051bb7464aae953217b831d7a11fa426eebce8
parent 18b23afa4b467b6f7ed925a3f954a94eeb441c1b
parent ee9e5d098191cf1fa0932db7498963de3d6dcf1b
author Dan Willemsen <dwillemsen@google.com> 1494266879 +0000
committer android-build-merger <android-build-merger@google.com> 1494266879 +0000

Merge changes Ie0b30417,I8b6e802e
am: ee9e5d0981

Change-Id: Ic24a4699bb8dc0590897f4c22df90a2af5a3c693