summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2015-01-23 21:20:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-23 21:20:46 +0000
commitf612132003d787a2b0e6af35d7a6e291d1cb186c (patch)
tree9b9d2de4dcbdd15b2710ca9ccb98c0cc6b9b8e3a /core/java/com
parent1e5dd46133bd47445ba0657692fb86492acad705 (diff)
parentca1384dc5abb2d29906310fd577c5ed6fba25f24 (diff)
downloadframeworks_base-f612132003d787a2b0e6af35d7a6e291d1cb186c.zip
frameworks_base-f612132003d787a2b0e6af35d7a6e291d1cb186c.tar.gz
frameworks_base-f612132003d787a2b0e6af35d7a6e291d1cb186c.tar.bz2
am 56c119ab: Merge "CEC: Handles initiation of press-and-hold correctly" into lmp-mr1-dev
automerge: ca1384d * commit 'ca1384dc5abb2d29906310fd577c5ed6fba25f24': CEC: Handles initiation of press-and-hold correctly
Diffstat (limited to 'core/java/com')
0 files changed, 0 insertions, 0 deletions