Commit b3fc8689 authored by Julien Desprez's avatar Julien Desprez Committed by android-build-merger
Browse files

[automerger skipped] Submit the eclipse project for platform annotations am:... 

[automerger skipped] Submit the eclipse project for platform annotations am: 991a4ade am: 4ce6c13a
am: cf2de2fb  -s ours

Change-Id: I70401582c99dca464db1600682cfeaa7b588bf62
parents 99cfa0b8 cf2de2fb
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