5 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
Rich Slogar	38f2242e39	docs: studio mipmap update ... Change-Id: Id493c079186585a29a8c6b1ba57d921a7327868d	2015-02-13 17:17:41 -08:00
Rich Slogar	3f8e456be7	docs: project file and toc updates ... b/18681310 Change-Id: I0a4d4a85f60d0e9dccfbec86e6e54a718d43503a	2014-12-18 13:58:06 -08:00
Rich Slogar	5c80662fab	Docs: Fixed typo 'Fore' ... Change-Id: I67cacf2ca11be27f9352cd8bddb1f9e6ff8a65c6	2014-08-20 16:29:02 -07:00
Ricardo Cervera	1f0ffac153	docs: Adding docs for the new Android Studio wizards ... Change-Id: I19cf428b21d79f45fad325fa36fc51f043733994	2014-06-24 14:27:35 -07:00