tree 5451c867ef898d36760d56a1a8f2d48822ceea5a
parent 68851ea546cddca1136bd9a9b9b18abb2ce68cb0
parent 4c8326f8bbb8908aef19a96bd774618370df5acc
author Jerry Zhang <zhangjerry@google.com> 1508287117 +0000
committer android-build-merger <android-build-merger@google.com> 1508287117 +0000

Merge changes I234b2f09,Ifdca65fc
am: 4c8326f8bb

Change-Id: Ie5dec66495a51a55a3eb6e3939d43b9a8623e045