OSDN Git Service

Merge \"Added new setting for gestures.\" into nyc-mr1-dev
authorDoris Ling <dling@google.com>
Mon, 13 Jun 2016 22:29:14 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 13 Jun 2016 22:29:14 +0000 (22:29 +0000)
commit71e6b9a4d90e329d782d624d1cfb15af38fc15d6
tree1df7bac6ef2cd2fb62b83afe5bc6fa22dbd513d8
parent08ba377569a878a8378d0f3f2f51a40941a7a94f
parent8b8a012913a87cd2a36b9222209310e292485803
Merge \"Added new setting for gestures.\" into nyc-mr1-dev
am: 8b8a012913

Change-Id: I3bec17fcf1130c4948abeef256a169105d7ad464
AndroidManifest.xml
src/com/android/settings/SettingsActivity.java