summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2014-10-01 17:55:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-01 17:55:43 +0000
commit04e50c474ce5b6aa2e366bc057a29a16467a66bd (patch)
treea02b9bfd1e284b0cfb899c8b9920a459e1272164 /core/java
parent24199873ca3297555909914f92e3cab97169b057 (diff)
parentd1ba4c13d0928d10c467bd7fd5992186925e1a5a (diff)
downloadframeworks_base-04e50c474ce5b6aa2e366bc057a29a16467a66bd.zip
frameworks_base-04e50c474ce5b6aa2e366bc057a29a16467a66bd.tar.gz
frameworks_base-04e50c474ce5b6aa2e366bc057a29a16467a66bd.tar.bz2
am d1ba4c13: am ae3bd63b: am a1572ffc: Merge "Doc update: Update preprod (staging) instructions." into klp-modular-docs
* commit 'd1ba4c13d0928d10c467bd7fd5992186925e1a5a': Doc update: Update preprod (staging) instructions.
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions