OSDN Git Service

Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'
authorThe Android Automerger <android-build-merger@google.com>
Fri, 27 May 2016 20:05:56 +0000 (20:05 +0000)
committerThe Android Automerger <android-build-merger@google.com>
Fri, 27 May 2016 20:05:56 +0000 (20:05 +0000)
commit6f2f02e4ae5d61111bf52dbddd105cbc0a0f5e74
treee61c6781dbc74594a9e42299e58beb5f4b7f390c
parentc22f3e886631a0c1e440a618fad6d4b09e38404f
parent93c1d3aa6e20b52a37548af0bf9f9a66948a7611
Merge commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611'

* commit '93c1d3aa6e20b52a37548af0bf9f9a66948a7611':
  docs: Refinements for testing
  Fix toast with accessibility and app pinning
  Updated link to material design page.
  Change overdraw test to use windowbackground
  Prevent callbacks during DrawableContainer child initialization
  Fixing crash in SysUI due to invalid group.
  Cherry pick: docs: Edited "Features Reference" section in "<uses-feature>" page.
  Fix Activity Transition mess-up.
  Time to #NameAndroidN!
  Prevent use of a null sCallbackObj by Hardware FLP
  Fixed the relative time spoken with accessibility
  Use backstop timeouts on asynchronous countdown during preflight
core/java/android/app/Activity.java
core/res/res/values/strings.xml