2 Commits

Author SHA1 Message Date
Elliott Hughes
4656e69bf3 resolved conflicts for merge of 2008cff7 to lmp-dev-plus-aosp
Change-Id: I5148eda624e8504f12dbc1288cd4a7a5b7c10850
2014-09-08 13:08:43 -07:00
Scott Main
039d44114e add the JD docs for the Android Wear docs (delte the HTML versions)
This depends on the following CL that makes this all work with template changes:
I848f442b3bc66ee2fb87db8200df370d13762d29

Change-Id: I6b17db774de6fa8be0bf944516a44ba73b10cabb
2014-03-26 19:23:38 -07:00