summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorChristopher Ferris <cferris@google.com>2015-05-07 19:42:02 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-07 19:42:02 +0000
commit411feedf68dd52cd6e9777bb163f63eee73bfe32 (patch)
treeac1f9770d0bbd14548f96dfbc8d62858dfeee749 /api
parent7b753cf12e471e15a4b1c1b710393b40502a8bb7 (diff)
parenta7f27a767347af8383c78be656fb5d809ee60951 (diff)
downloadframeworks_base-411feedf68dd52cd6e9777bb163f63eee73bfe32.zip
frameworks_base-411feedf68dd52cd6e9777bb163f63eee73bfe32.tar.gz
frameworks_base-411feedf68dd52cd6e9777bb163f63eee73bfe32.tar.bz2
am a7f27a76: (-s ours) am 504bb9e7: Merge "Temporarily increase saved tombstone size. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'a7f27a767347af8383c78be656fb5d809ee60951': Temporarily increase saved tombstone size. DO NOT MERGE
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions