tree 04756b5d2fb6b0852ac7e25e2f7433190f27fe6f
parent 9bd932fdfc6784560db9a4d6ad12d3119e151b54
parent 6bf19f7c778cfc47e073cd4f7245ed6e9b94e5d5
author Logan Chien <loganchien@google.com> 1499417759 +0000
committer android-build-merger <android-build-merger@google.com> 1499417759 +0000

Merge changes Iea55330d,I547319f2 am: 7369c92fbc
am: 6bf19f7c77

Change-Id: Ida793d41885e50956300d54605cf9844fbc49da0