OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef17956 b5e754d)
am b5e754dd: am 8ea583a7: am f9943d0e: Merge "add the JD docs for the Android Wear...
authorScott Main <smain@google.com>
Thu, 27 Mar 2014 09:31:08 +0000 (09:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Mar 2014 09:31:08 +0000 (09:31 +0000)
commit68d43e275efae8f7b83388ea6fdebbcf5cd1504f
treed5f5fb9aa3b76177c68860837c960d8f34549cb8tree | snapshot
parentef17956363c5d2d1b89edd3d6bbe538fe4e516f3commit | diff
parentb5e754dd4d8accd0c1500008aa1a6dbf178d33d7commit | diff
am b5e754dd: 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 'b5e754dd4d8accd0c1500008aa1a6dbf178d33d7':
  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
frameworks/base
About OSDN
Find Software
Develop Software
Help