tree dbdf108e6b230bb84607bb3d2cb872fc63aa3175
parent 85f5725fb53ec1af4b31643e4cf4facbfee26d6a
parent c923752929e8221fdcaf75bae3db00872b894bb7
author Hugo Benichi <hugobenichi@google.com> 1492076062 +0000
committer android-build-merger <android-build-merger@google.com> 1492076062 +0000

Merge changes Ia15f77e2,Icaa1f95c
am: c923752929

Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc