| commit | b5e754dd4d8accd0c1500008aa1a6dbf178d33d7 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Mar 27 09:24:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 27 09:24:46 2014 +0000 |
| tree | c48a06a276e1993f251ce3bc188f574768b42233 | |
| parent | e0c66e73b45f228a87086257a9aa7c13361f8b18 [diff] | |
| parent | 8ea583a71aef2f21f833c003a948ca7b1dc32915 [diff] |
am 8ea583a7: am f9943d0e: Merge "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" into klp-docs * commit '8ea583a71aef2f21f833c003a948ca7b1dc32915': 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