diff options
| author | Rich Slogar <rslogar@google.com> | 2014-10-16 19:09:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-16 19:09:38 +0000 |
| commit | 436d4df6433e444fa08ec8258f48187e67018dda (patch) | |
| tree | debfd6324aa1ed029bec04281be6425e22f0f631 /core/java/android/preference/PreferenceFragment.java | |
| parent | 3b278f61fb8f52e7601759081f293c7c9b7e1266 (diff) | |
| parent | 6b1edcd0c852a6365ad3ddc802b8e94b2da99606 (diff) | |
| download | frameworks_base-436d4df6433e444fa08ec8258f48187e67018dda.zip frameworks_base-436d4df6433e444fa08ec8258f48187e67018dda.tar.gz frameworks_base-436d4df6433e444fa08ec8258f48187e67018dda.tar.bz2 | |
am 349e3640: am 70807ab1: Merge "docs:Build and Platform Tools Updates for Android 5" into lmp-dev
automerge: 6b1edcd
* commit '6b1edcd0c852a6365ad3ddc802b8e94b2da99606':
docs:Build and Platform Tools Updates for Android 5
Diffstat (limited to 'core/java/android/preference/PreferenceFragment.java')
0 files changed, 0 insertions, 0 deletions