Commit 783c166a authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

Merge \"Update instructions for merging upstream changes.\" 

am: 17f8bff8

Change-Id: Iebd2e35ef94dca045e3e4d325695d624a4392b24
parents d3c96cea 17f8bff8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment