OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2903bc 054255c)
am 054255c6: Merge "Unhide action to launch Daydream settings." into jb-mr2-dev
authorDaniel Sandler <dsandler@android.com>
Thu, 30 May 2013 19:36:59 +0000 (12:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 30 May 2013 19:36:59 +0000 (12:36 -0700)
* commit '054255c6d282a4ab2a95e56859242a2512871296':
  Unhide action to launch Daydream settings.

1  2 
api/current.txt patch | diff1 | diff2 | blob | history

diff --cc api/current.txt
Simple merge
frameworks/base
About OSDN
Find Software
Develop Software
Help