Skip to content
Commit 05ecfd30 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aosp 

* commit '33d3c53d':
  Move hidden ApplicationInfo flags into a separate field.
parents 62958c7f 33d3c53d
Hide whitespace changes
Inline Side-by-side
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