OSDN Git Service

Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
authorTrevor Johns <trevorjohns@google.com>
Wed, 20 Apr 2016 21:12:38 +0000 (21:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 21:12:38 +0000 (21:12 +0000)
commitc0d2c43a22c9a0feda8d651d432aa3893e0cf952
tree6945b68543ededf07816dd60fd7395fe70390fbf
parent24cd97aba3cc388ec639a4627e67e96dc4e65ac1
parent59c9a93fc268e226495d4ee8cf7c507c2ea2c433
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
core/java/android/view/View.java