Commit Graph

3 Commits

Author SHA1 Message Date
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
2016-04-19 02:03:59 -07:00
Katie McCormick
467f5db879 Doc Update: add immersive mode to sysui class.
Change-Id: I809d95e14b04099d40302b03ca75a7f8f671c22c
2013-11-14 14:12:58 -08:00
Katie McCormick
cfd3047f42 Doc update: Managing System UI class
Change-Id: I8c8f8864411a4be64426e347351690078c922c1c
(cherry picked from commit d20c87c550)
2013-10-31 21:18:44 +00:00