Skip to content
Snippets Groups Projects
Commit d84d9f86 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

resync with AOSP master 

Merge conflict resolution patch 11a29f29
inadvertently dropped a comment line. Pick it back up.

Change-Id: I0f7a7cdbdacafb86610595ee616e84a06da50a17
parent d065f048
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment