OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d25a1d e03ca16)
am e03ca16d: am 8552b77c: am f377bffb: am a8f68d2d: am af46e1b4: resolved conflicts...
authorAndrew Solovay <asolovay@google.com>
Mon, 17 Aug 2015 19:07:25 +0000 (19:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 17 Aug 2015 19:07:25 +0000 (19:07 +0000)
* commit 'e03ca16d1bf71ba453126bbd6d5ee8c5cb6a46e8':
  docs: Updating the permissions docs for Preview 3.


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