am 381c322e: Save to drive promo. b/7659807.

* commit '381c322eb30c39f63a2bb82812d63262eb3c1c1c':
  Save to drive promo. b/7659807.
am 9e86baf7: (-s ours) Merge "DO NOT MERGE Revert 4 CLs that updated the message headers." into ub-gmail-ur12-dev

* commit '9e86baf73cb208f39312eca73b656f35a39bea18':
  DO NOT MERGE Revert 4 CLs that updated the message headers.
Merge "Use new notification action api to fix the remote button problem." into ub-gmail-ur12-dev
Add empty state analytics to GA

Add event logging for how many times the empty state appears in which label.
Supported scenario:
  - change folder, and the new folder is empty (action: post_label_change)
  - empty out the current folder (action: post_delete)

b/13172001

Change-Id: I10a3374fb446f647f2c711d4fa567856511f214c
am 974c99c3: Merge "Use new notification action api to fix the remote button problem." into ub-gmail-ur12-dev

* commit '974c99c3cac75eac528be283198fe13cd88249ef':
  Use new notification action api to fix the remote button problem.
Merge "Add empty state analytics to GA" into ub-gmail-ur12-dev
am 4a57e7b9: Merge "Add empty state analytics to GA" into ub-gmail-ur12-dev

* commit '4a57e7b99ef398cdbd98623869995ef1e2a325c2':
  Add empty state analytics to GA
Fix b/13624215. Update background colors.

Now all of the items in the drawer use the same
background color.

Change-Id: Idc0b91567767b6444e020ae3dd3189c8b6450dd4
Merge "Fix b/13624215. Update background colors." into ub-gmail-ur12-dev
am d6ee9040: Merge "Fix b/13624215. Update background colors." into ub-gmail-ur12-dev

* commit 'd6ee90404352909bb25360533b3baeab72089099':
  Fix b/13624215. Update background colors.
Import translations. DO NOT MERGE

Change-Id: Id09379fba244c0936acfae018a182971eb8985b0
Auto-generated-cl: translation import
am 92845d7d: (-s ours) Import translations. DO NOT MERGE

* commit '92845d7db94812cb430d046ce6091a64c122ef5e':
  Import translations. DO NOT MERGE
am e80bd429: (-s ours) am 92845d7d: (-s ours) Import translations. DO NOT MERGE

* commit 'e80bd42911b594798be03e80978bb13e500284c9':
  Import translations. DO NOT MERGE
Fix b/14271599. App crashes when leaving ad view.

Change-Id: Ia37463146ce035388405ea06599273d36e1e1d51
am 7ec2a2a4: Fix b/14271599. App crashes when leaving ad view.

* commit '7ec2a2a4aeb342fb40a6fd3a8eb5269412a1ec14':
  Fix b/14271599. App crashes when leaving ad view.
Fix loading view

Slow rendering on ICS seems to cause the new 0.5 second minimum loading
time to essentially flicker on the screen (for example, it takes 0.4 seconds
to render the loading view, and then gets destroyed after the 0.5 second
interval is up). Since empty view and loading view never changes, we'll
simply make them invisible instead of gone to avoid having them re-rendered
every time.

Also fixed a race condition with showing the loading view before setting
the loading view flag (can cause the loading view to show up for a brief
moment, similar to what the search on ICS was doing).

b/14273810

Change-Id: I450c895372c662375e0f926e4489dfe4ece8ad07
am 90c61672: Fix loading view

* commit '90c61672da50a00663c54fa2effbbe5febd041c9':
  Fix loading view
Fix b/13624037. Restore adding unknown contacts.

Change-Id: Iff5596626b33342409624d24d44089934c86ae0e
Use proper conversation uri in secure conv view.

Also add null checks. b/7659807.

Change-Id: I0af249178236d6411b8e991c2ca4d03b33e7145b
am 41d2b6bd: Use proper conversation uri in secure conv view.

* commit '41d2b6bdf39f5a3d78ae938eff1057f3849408f0':
  Use proper conversation uri in secure conv view.