tree 8f6063050f4aec088611d4b750aff632e327f80d
parent 5a73b6f9aa0c9486c252fa26772d2984fdc86c81
parent 9856bfbc9ade29dd255413e56314cfb0956c7af3
author Ningyuan Wang <nywang@google.com> 1476219692 +0000
committer android-build-merger <android-build-merger@google.com> 1476219692 +0000

resolve merge conflicts of 849c5c7 to mnc-dev am: 29a2baf319 am: 583dc0e86d am: e61906f92c am: 8851f93e19
am: 9856bfbc9a

Change-Id: I7e3cd0a082686e925fe750d2f260054436616206