tree d7388b47c0c7440a1be6693ac30c18ef8cc8184d
parent 6dfb0ca3d5a34dfeb8d0973ff7e9b46c547aa14a
parent c729ff8253ba58e49d42d4662ddf86d4fe8ed909
author Hugo Benichi <hugobenichi@google.com> 1498263204 +0000
committer android-build-merger <android-build-merger@google.com> 1498263204 +0000

Merge changes I193297e0,I43beb966
am: c729ff8253

Change-Id: Ie35f8cfe6ab77d0547f38b3bdcaf8f57832c0354