summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-11-08 09:48:28 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-08 09:48:46 -0800
commit9de5901bb37ad2a42d334405f41e629fa29dfd46 (patch)
tree3bfd28015831b923ce5fb0d439b8154e4eaa660c /services
parent7d59cf9f10c38a020c7104e3bd5b358ab2144ab5 (diff)
parentb499b1fa082147ad37e1211f32210b44bdbc0750 (diff)
downloadframeworks_base-9de5901bb37ad2a42d334405f41e629fa29dfd46.zip
frameworks_base-9de5901bb37ad2a42d334405f41e629fa29dfd46.tar.gz
frameworks_base-9de5901bb37ad2a42d334405f41e629fa29dfd46.tar.bz2
Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions