Jeff Hamilton a9bb7f1472 resolved conflicts for merge of ac96a560 to honeycomb-merge ...

Change-Id: Ibc0b1fa69597672293f6b753f18f8a14ee732d0b

2011-01-26 11:12:41 -06:00

..

app_notes.png

This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e

2010-12-02 12:09:38 -08:00

ic_menu_compose.png

This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e

2010-12-02 12:09:38 -08:00

ic_menu_delete.png

This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e

2010-12-02 12:09:38 -08:00

ic_menu_edit.png

This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e

2010-12-02 12:09:38 -08:00

ic_menu_revert.png

This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e

2010-12-02 12:09:38 -08:00

ic_menu_save.png

This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e

2010-12-02 12:09:38 -08:00

live_folder_notes.png

This is a manual merge of Ib7ea41079f3b268f3be1f86febdb1caed98bdd8e

2010-12-02 12:09:38 -08:00