tree 04756b5d2fb6b0852ac7e25e2f7433190f27fe6f
parent 6a0b93ed7c0ab66e6990861adc6b5e15666b23c0
parent 7369c92fbc924218ec87967bfc399d03d7c0577a
author Logan Chien <loganchien@google.com> 1499417520 +0000
committer android-build-merger <android-build-merger@google.com> 1499417520 +0000

Merge changes Iea55330d,I547319f2
am: 7369c92fbc

Change-Id: Ifd6f0793f94942c845a2f969e35dda980456b3d1