Skip to content
Commit 45c92017 authored by Colin Cross's avatar Colin Cross
Browse files

Merge remote-tracking branch 'aosp/upstream' into master 

* aosp/upstream:
  Add presingletons

Test: m checkbuild
Change-Id: I45407890f69937d65892955b7faf2f7eb838433c
parents 4f212373 7ab9124b
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