GitLab

* commit '6e3f87f6':
  Add an <application> tag to the manifest

* commit 'f24d4e83':
  Add an <application> tag to the manifest

Some testing infrastructure requires this.

Change-Id: I33080ef9230b961e0e6453c3e631e1219e97e18a

* commit '5c4d941d':
  Remove resource conflicts in datetimepicker

* commit 'acb426ab':
  Remove resource conflicts in datetimepicker

Removes some unnecessary resources which conflict with recurrencepicker
From bakergo@

Change-Id: Iddab59e53d049eef7ad0efae7a5b4bbd6df5f993

* commit 'a8a7272a':
  Import translations. DO NOT MERGE

* commit '589c0d7d':
  Import translations. DO NOT MERGE

Change-Id: I7d6819a82998d255f6ffa68fd79db83543b51047
Auto-generated-cl: translation import

* commit '2db9672b':
  Use float instead of int to have better accuracy

* commit 'eb5e8a31':
  Use float instead of int to have better accuracy

* commit '48bf1deb':
  Use float instead of int to have better accuracy

Bug:16552376
Change-Id: I92f5bb993df788f4c503052629cb06467f5bfaad

Change-Id: I7b08414d2e708e477f3d0eed9e1fd1514c19de7c

Change-Id: I6f1c3fd2813031a483d958965ee891f288027e9f
Auto-generated-cl: translation import

* commit '1ec17909':
  Prepare MonthView to support new features in child classes

* commit '7136720c':
  Prepare MonthView to support new features in child classes

* commit '59d94e4e':
  Prepare MonthView to support new features in child classes

Change-Id: I56c4b9e8b9ed54e786ea543b5ed728249af56694

am 049e4230: (-s ours) am ceee2653: (-s ours) am 94a2de69: (-s ours) am 8b346970: (-s ours) Import translations. DO NOT MERGE

* commit '049e4230':
  Import translations. DO NOT MERGE

am ceee2653: (-s ours) am 94a2de69: (-s ours) am 8b346970: (-s ours) Import translations. DO NOT MERGE

* commit 'ceee2653':
  Import translations. DO NOT MERGE

* commit '661dd349':
  Import translations. DO NOT MERGE

* commit '94a2de69':
  Import translations. DO NOT MERGE

* commit '02deaf45':
  Import translations. DO NOT MERGE

* commit '8b346970':
  Import translations. DO NOT MERGE

Change-Id: I38f247eea2d29fbe28ee2cfb32b4d147ef22732c
Auto-generated-cl: translation import

Change-Id: I3682c44fb9935faaf7485233dbdf4f926c81ac87
Auto-generated-cl: translation import

Change-Id: I81e084bfbaad639d583d95a79c757bf054999fee
Auto-generated-cl: translation import

Change-Id: Ia71ea62cc86a1d3f161596b71313176770ad079d
Auto-generated-cl: translation import

* commit 'd8ce5d2e':
  Update MonthView class to be used in xml layouts

* commit '9e7f7405':
  Update MonthView class to be used in xml layouts

* commit 'fc0e80c9':
  Update MonthView class to be used in xml layouts

Change-Id: I9c9eeb7f4f8b45db44f606ab8c1f9615f7ae8ec1

Conflicts:
	src/com/android/datetimepicker/date/MonthView.java

am f6d19b49: am b3330b4e: am d89e3fa6: Support new redlines for minimonth Calendar on phone and tablet

* commit 'f6d19b49':
  Support new redlines for minimonth Calendar on phone and tablet

* commit 'b3330b4e':
  Support new redlines for minimonth Calendar on phone and tablet

* commit 'd89e3fa6':
  Support new redlines for minimonth Calendar on phone and tablet

Bug: 14994638
Change-Id: Ie17017e3c9ba066aec7d24f1a21ec4bd0bb2bd4e

* commit 'a73a6ae9':
  Check if mController is null

* commit 'f455054e':
  Check if mController is null

* commit 'e0a0cb28':
  Check if mController is null