summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2014-09-24 15:56:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-24 15:56:02 +0000
commit2c1ef5328cee7059b1ab0d8de849c2fa474f88dd (patch)
treee568b03ffd79af83302a27f726e4e500999edf4b /core/java/android/preference
parentbca67fd7d0747a950e88525d216af41272b20763 (diff)
parent1968b91937020e8aa826224642733bbb9055af2e (diff)
downloadframeworks_base-2c1ef5328cee7059b1ab0d8de849c2fa474f88dd.zip
frameworks_base-2c1ef5328cee7059b1ab0d8de849c2fa474f88dd.tar.gz
frameworks_base-2c1ef5328cee7059b1ab0d8de849c2fa474f88dd.tar.bz2
am 1968b919: am b8a60dad: Merge "docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher" into klp-modular-docs
* commit '1968b91937020e8aa826224642733bbb9055af2e': docs: Update the staging app.yaml to be compatible with GAE 1.9.4 and higher
Diffstat (limited to 'core/java/android/preference')
0 files changed, 0 insertions, 0 deletions