tree 001c22a3b8c0147c0e96c0ee027d64f32e3d8b30
parent 13bd85772f6279d14303ec3a18615613c3722844
parent a32c43761e5a101efbbb9183f4421ba40f4c75fb
author Scott Main <smain@google.com> 1395307851 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395307851 +0000

am a32c4376: update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad

* commit 'a32c43761e5a101efbbb9183f4421ba40f4c75fb':
  update to wear docs. includes javadoc changes from Id95383d18f9a679927f462822335dce8890fa414 and html doc changes from patch set 9 from I949011be5abfb5190dc5716ce935d1555ff1b2ad