OSDN Git Service

Merge "Add setMasterMono and getMasterMono"
authorAndy Hung <hunga@google.com>
Fri, 8 Jan 2016 23:17:56 +0000 (23:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 8 Jan 2016 23:17:56 +0000 (23:17 +0000)
commit867b3396605421708dbcb0595b8954a3f96858ed
treee676d8b6ce664ea3a65985e4d4c1a5db5e7f6bc7
parent0ab0bdde2b39c77175d9e0d69d6631e130e4b5ac
parentf04b84d4c66ea377ec6fe2b36f3a0994f3e94eba
Merge "Add setMasterMono and getMasterMono"
core/java/android/provider/Settings.java
core/res/AndroidManifest.xml