tree b815e515dd59550bd42235f0e6c74054bc883def
parent ca6ebb0f393048de7742cd1d10e1ae4375d4eb2f
parent 48bc4c1f420d8f60c4d83d0ded4be0f37a37dd22
author Hugo Benichi <hugobenichi@google.com> 1497942153 +0900
committer Hugo Benichi <hugobenichi@google.com> 1497942158 +0900

resolve merge conflicts of 48bc4c1f420d to stage-aosp-master

Change-Id: I41889b0497463e8a63cf2d1e983e7e54298c5c2e