# This is a combination of 3 commits.
# The first commit's message is:
[from now] 2014/12/20 16:53:01

 .../example/oky/u_do/Activity/EditActivity.java    | 32 ++++++++++++++--------
 .../example/oky/u_do/Fragment/TodoFragment.java    |  6 ++--
 .../java/com/example/oky/u_do/MainActivity.java    | 21 ++++++++------
 3 files changed, 38 insertions(+), 21 deletions(-)

# This is the 2nd commit message:

[from now] 2014/12/20 17:10:07

 app/src/main/java/com/example/oky/u_do/Activity/EditActivity.java | 4 +++-
 app/src/main/java/com/example/oky/u_do/MainActivity.java          | 2 --
 app/src/main/res/layout/activity_edit.xml                         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

# This is the 3rd commit message:

[from now] 2014/12/20 17:21:36

 .../example/oky/u_do/Activity/EditActivity.java    | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
add actionbar image

[from now] 2014/12/20 16:53:01

 .../example/oky/u_do/Activity/EditActivity.java    | 32 ++++++++++++++--------
 .../example/oky/u_do/Fragment/TodoFragment.java    |  6 ++--
 .../java/com/example/oky/u_do/MainActivity.java    | 21 ++++++++------
 3 files changed, 38 insertions(+), 21 deletions(-)

[from now] 2014/12/20 17:10:07

 app/src/main/java/com/example/oky/u_do/Activity/EditActivity.java | 4 +++-
 app/src/main/java/com/example/oky/u_do/MainActivity.java          | 2 --
 app/src/main/res/layout/activity_edit.xml                         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

[from now] 2014/12/20 17:21:36

 .../example/oky/u_do/Activity/EditActivity.java    | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)

[from now] 2014/12/20 19:19:40

 .../java/com/example/oky/u_do/Activity/EditActivity.java  |  10 ++--------
 .../java/com/example/oky/u_do/Fragment/TodoFragment.java  |   2 +-
 app/src/main/java/com/example/oky/u_do/MainActivity.java  |   2 +-
 app/src/main/res/drawable-hdpi/ic_delete_white_24dp.png   | Bin 0 -> 246 bytes
 app/src/main/res/drawable-hdpi/ic_done_white_24dp.png     | Bin 0 -> 309 bytes
 app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png | Bin 0 -> 561 bytes
 app/src/main/res/drawable-mdpi/ic_delete_white_24dp.png   | Bin 0 -> 197 bytes
 app/src/main/res/drawable-mdpi/ic_done_white_24dp.png     | Bin 0 -> 243 bytes
 app/src/main/res/drawable-mdpi/ic_settings_white_24dp.png | Bin 0 -> 420 bytes
 app/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png  | Bin 0 -> 270 bytes
 app/src/main/res/drawable-xhdpi/ic_done_white_24dp.png    | Bin 0 -> 363 bytes
 .../main/res/drawable-xhdpi/ic_settings_white_24dp.png    | Bin 0 -> 737 bytes
 app/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png | Bin 0 -> 338 bytes
 app/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png   | Bin 0 -> 476 bytes
 .../main/res/drawable-xxhdpi/ic_settings_white_24dp.png   | Bin 0 -> 974 bytes
 app/src/main/res/layout/activity_edit.xml                 |   5 +++--
 app/src/main/res/menu/menu_edit.xml                       |  11 +++++++++--
 app/src/main/res/menu/menu_main.xml                       |  11 +++++++++--
 app/src/main/res/menu/menu_multi_select.xml               |  11 ++++++-----
 19 files changed, 31 insertions(+), 21 deletions(-)