Trevor Johns
682c24e228
Resolve merge conflicts of a5060ee to nyc-dev
...
This undoes the automerger skip which occured in
commit e740c84dc3
2016-04-19 02:03:59 -07:00
Katie McCormick
d9a32847e5
am 0f3390f8: am c4927389: am 1e609ac4: am 4e6c5408: am c8b93fd9: Merge "Doc update: clarify version of flags." into klp-docs
...
* commit '0f3390f846ed5ee63e3926b78878c7b75ee2f0c0':
Doc update: clarify version of flags.
2013-12-16 18:39:25 +00:00
Katie McCormick
8b8194b500
Doc update: clarify version of flags.
...
Fixes:
b/11999080
Change-Id: I0eda86d5162caab6809ff780387091544530dc32
2013-12-12 14:48:39 -08:00
Katie McCormick
3a5b037422
am ad0cab26: am fdb738a5: am 752d8029: Merge "Doc update: minor changes to immersive lesson" into klp-docs
...
* commit 'ad0cab26a7abb0b6d08e5a807bf8aff87db0a52a':
Doc update: minor changes to immersive lesson
2013-11-27 10:47:50 -08:00
Katie McCormick
9dd04e720a
Doc update: minor changes to immersive lesson
...
Change-Id: I4b830b1de6f92c7f5f0f1106f2f797bb891d73e2
2013-11-18 15:27:41 -08:00
Katie McCormick
2c74c5f182
am 0dcddb44: am 9db6e7c6: am fb828c8c: Merge "Doc Update: add immersive mode to sysui class." into klp-docs
...
* commit '0dcddb447c97d5220d21315de428079dada9bdcb':
Doc Update: add immersive mode to sysui class.
2013-11-14 15:49:07 -08:00
Katie McCormick
467f5db879
Doc Update: add immersive mode to sysui class.
...
Change-Id: I809d95e14b04099d40302b03ca75a7f8f671c22c
2013-11-14 14:12:58 -08:00
Joe Fernandez
33baa5ad7d
Removing quotes from page.tags values
...
Change-Id: I9e12079568ef7be8574743a34856ed2839e1e76a
2013-11-14 21:00:10 +00: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
Katie McCormick
d20c87c550
Doc update: Managing System UI class
...
Change-Id: I8c8f8864411a4be64426e347351690078c922c1c
2013-10-30 16:23:48 -07:00
