OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab344b8 59c9a93)
Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
authorTrevor Johns <trevorjohns@google.com>
Wed, 20 Apr 2016 18:43:55 +0000 (18:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 20 Apr 2016 18:43:55 +0000 (18:43 +0000)
am: 59c9a93

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

Change-Id: I3ce213d0e7412125861d39f1726be4b5a751c828


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help