tree 144d150d203e65cd0d2ed79a1a21d044e33fffb0
parent 784a690ec71520109e14f3f93cbc8e4038bbd023
parent c5212b665486d9db34a726e4d9d8e7bd1fa09f1b
author Hugo Benichi <hugobenichi@google.com> 1513641435 +0000
committer android-build-merger <android-build-merger@google.com> 1513641435 +0000

Merge changes I798d8fec,I4a2d5866
am: c5212b6654

Change-Id: Idf04186ece2738c113e2e33c5e7a5133aa437933