summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2015-01-13 18:19:39 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-13 18:19:39 +0000
commitb1a0a57ccab94e479087b620dcea2b39225693bb (patch)
treeb0f6f673df701ab92054c75a2b38662534365b54
parente5d3ee8e4fae72ef554a0e1084e88aea9ed8f020 (diff)
parent7ce662ef870df34cd189b4ce9e487e496ba407dd (diff)
downloadframeworks_base-b1a0a57ccab94e479087b620dcea2b39225693bb.zip
frameworks_base-b1a0a57ccab94e479087b620dcea2b39225693bb.tar.gz
frameworks_base-b1a0a57ccab94e479087b620dcea2b39225693bb.tar.bz2
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev
automerge: 7ce662e -s ours * commit '7ce662ef870df34cd189b4ce9e487e496ba407dd': DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
0 files changed, 0 insertions, 0 deletions