summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJohn Spurlock <jspurlock@google.com>2014-05-30 23:51:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-30 23:51:13 +0000
commitb8a0feed0406e91eaa6f5bee223bc9316171c2b6 (patch)
tree7c458d6171572c8c6820a58bb0a0d2a7f4d931b5 /api
parent05dc18d69ad64254f2bcdd9c1e208ab54ee664fe (diff)
parent822e5cc4823a09727833eb984e3982dcd98e4d99 (diff)
downloadframeworks_base-b8a0feed0406e91eaa6f5bee223bc9316171c2b6.zip
frameworks_base-b8a0feed0406e91eaa6f5bee223bc9316171c2b6.tar.gz
frameworks_base-b8a0feed0406e91eaa6f5bee223bc9316171c2b6.tar.bz2
Merge "Resurrect global actions, remove confirmation for Power off." into lmp-preview-dev
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions