tree c569740ef8c5be1ba9701e2ec0122ec56b15b505
parent 64af4183a1069f2ba4165aa6d480f9d234bdcff5
parent bc8433d582266f875fac02b7754701b33dc98ba0
author Josh Gao <jmgao@google.com> 1489197195 +0000
committer android-build-merger <android-build-merger@google.com> 1489197195 +0000

Merge changes I7d394c66,I737d66e8
am: bc8433d582

Change-Id: I40a4e7f44dad478a7796a4f591d46369ad95b6be