| commit | 28c89a900d4b39a37d90fd7b1788c9c01e2c82cf | [log] [tgz] |
|---|---|---|
| author | Vikram Aggarwal <viki@google.com> | Wed Apr 17 15:41:04 2013 -0700 |
| committer | Vikram Aggarwal <viki@google.com> | Wed Apr 17 15:41:04 2013 -0700 |
| tree | cbfdbce34af31ae73a3c37e27d15e4512af313f7 | |
| parent | 25a8ed222c0a61beacc081a0965b91545cafbc7b [diff] | |
| parent | 43be61f1e21cd749702e87f9be3e3306d6707b00 [diff] |
Merge commit '43be61f1' into noShow Conflicts: res/values-sw600dp/styles.xml src/com/android/mail/ui/OnePaneController.java Change-Id: I9d669b2230581b8dc0b2bc4fd52bd5f2415660b4