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