Merge heads

2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
@@ -52,6 +52,7 @@ limitations under the License.
          style="@style/ListItemDate" />
      </TableRow>
      <TableRow>
+        <!-- Need to match the style set in ListItemUtils.setListItem -->
        <TextView
          android:id="@+id/list_item_time_distance"
          android:layout_gravity="bottom"