OSDN Git Service

Merge \\"Making timeouts configurable through Settings\\" into nyc-mr1-dev am: 33fa5dfa1d
authorSuprabh Shukla <suprabh@google.com>
Fri, 8 Jul 2016 14:52:26 +0000 (14:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jul 2016 14:52:26 +0000 (14:52 +0000)
commit8a6b090fd49789a63775f52dc4966a82bae76747
treec8e289cc99ca890f20e3feacc74dca3a644daf54
parentf0f1d016e334bf5f459ec4121c6d407bad689932
parent087d33febffdd28d85021800aa42a51b94b64f4a
Merge \\"Making timeouts configurable through Settings\\" into nyc-mr1-dev am: 33fa5dfa1d
am: 087d33febf

Change-Id: If1bb99b356d4b6fdf3471e1ccccc2c6ebf8ace43
core/java/android/provider/Settings.java
core/res/AndroidManifest.xml