Scott Main ad60decc9d resolved conflicts for merge of c8e12573 to honeycomb-plus-aosp ...

Change-Id: I2ee1cb90df9617e470aec99671a05d99939f30f2

2011-01-12 16:31:35 -08: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